diff --git a/brewman/brewman/__version__.py b/brewman/brewman/__version__.py index 62ad3ee9..1f28d710 100644 --- a/brewman/brewman/__version__.py +++ b/brewman/brewman/__version__.py @@ -1 +1 @@ -__version__ = "9.2.0" +__version__ = "9.3.0" diff --git a/brewman/brewman/routers/db_integrity.py b/brewman/brewman/routers/db_integrity.py index cb8a1ac4..9b4420d2 100644 --- a/brewman/brewman/routers/db_integrity.py +++ b/brewman/brewman/routers/db_integrity.py @@ -27,12 +27,12 @@ def post_check_db(db: Session = Depends(get_db), user: UserToken = Security(get_ duplicate_attendances = get_duplicate_attendances(db) if duplicate_attendances > 0: fix_duplicate_attendances(db) - info["Duplicate Attendances Fixed"] = duplicate_attendances + info["attendanceCount"] = duplicate_attendances db.commit() return info -def get_duplicate_attendances(db): +def get_duplicate_attendances(db: Session) -> int: sub_query = ( db.query( over( @@ -51,7 +51,7 @@ def get_duplicate_attendances(db): return query.scalar() -def fix_duplicate_attendances(db): +def fix_duplicate_attendances(db: Session) -> None: sub = ( db.query( over( diff --git a/brewman/pyproject.toml b/brewman/pyproject.toml index 7f8074e0..64efb190 100644 --- a/brewman/pyproject.toml +++ b/brewman/pyproject.toml @@ -1,13 +1,13 @@ [tool.poetry] name = "brewman" -version = "9.2.0" +version = "9.3.0" description = "Accounting plus inventory management for a restaurant." authors = ["tanshu "] [tool.poetry.dependencies] python = "^3.8" -uvicorn = "^0.12.2" -fastapi = "^0.61.1" +uvicorn = "^0.12.3" +fastapi = "^0.61.2" python-jose = {extras = ["cryptography"], version = "^3.2.0"} passlib = {extras = ["bcrypt"], version = "^1.7.3"} psycopg2-binary = "^2.8.6" @@ -17,7 +17,7 @@ PyJWT = "^1.7.1" alembic = "^1.4.3" itsdangerous = "^1.1.0" python-dotenv = "^0.14.0" -pydantic = {extras = ["dotenv"], version = "^1.7.2"} +pydantic = {extras = ["dotenv"], version = "^1.7.3"} starlette = "^0.13.6" [tool.poetry.dev-dependencies] diff --git a/overlord/angular.json b/overlord/angular.json index 48b9dcb4..86416c15 100644 --- a/overlord/angular.json +++ b/overlord/angular.json @@ -102,14 +102,9 @@ "lint": { "builder": "@angular-eslint/builder:lint", "options": { - "eslintConfig": ".eslintrc.js", - "tsConfig": [ - "tsconfig.app.json", - "tsconfig.spec.json", - "e2e/tsconfig.json" - ], - "exclude": [ - "**/node_modules/**" + "lintFilePatterns": [ + "src/**/*.ts", + "src/**/*.html" ] } }, diff --git a/overlord/package.json b/overlord/package.json index 682a1158..5dbd4876 100644 --- a/overlord/package.json +++ b/overlord/package.json @@ -1,6 +1,6 @@ { "name": "overlord", - "version": "9.2.0", + "version": "9.3.0", "scripts": { "ng": "ng", "start": "ng serve", @@ -14,52 +14,52 @@ }, "private": true, "dependencies": { - "@angular/animations": "^11.0.2", - "@angular/cdk": "^11.0.0", - "@angular/common": "^11.0.2", - "@angular/compiler": "^11.0.2", - "@angular/core": "^11.0.2", + "@angular/animations": "^11.0.3", + "@angular/cdk": "^11.0.1", + "@angular/common": "^11.0.3", + "@angular/compiler": "^11.0.3", + "@angular/core": "^11.0.3", "@angular/flex-layout": "^11.0.0-beta.33", - "@angular/forms": "^11.0.2", - "@angular/material": "^11.0.0", - "@angular/material-moment-adapter": "^11.0.0", - "@angular/platform-browser": "^11.0.2", - "@angular/platform-browser-dynamic": "^11.0.2", - "@angular/router": "^11.0.2", + "@angular/forms": "^11.0.3", + "@angular/material": "^11.0.1", + "@angular/material-moment-adapter": "^11.0.1", + "@angular/platform-browser": "^11.0.3", + "@angular/platform-browser-dynamic": "^11.0.3", + "@angular/router": "^11.0.3", "@ngx-loading-bar/core": "^5.1.0", "@ngx-loading-bar/http-client": "^5.1.0", "@ngx-loading-bar/router": "^5.1.0", "@types/mousetrap": "1.6.3", "angular2-hotkeys": "^2.2.0", - "core-js": "^3.7.0", - "mathjs": "^8.0.1", + "core-js": "^3.8.0", + "mathjs": "^8.1.0", "moment": "^2.29.1", "rxjs": "^6.6.3", "tslib": "^2.0.0", "zone.js": "^0.11.3" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1100.2", - "@angular-eslint/builder": "^0.8.0-beta.2", - "@angular-eslint/eslint-plugin": "^0.8.0-beta.2", - "@angular-eslint/eslint-plugin-template": "^0.8.0-beta.2", - "@angular-eslint/schematics": "^0.8.0-beta.2", - "@angular-eslint/template-parser": "^0.8.0-beta.2", - "@angular/cli": "^11.0.2", - "@angular/compiler-cli": "^11.0.2", - "@angular/language-service": "^11.0.2", + "@angular-devkit/build-angular": "~0.1100.3", + "@angular-eslint/builder": "^0.8.0-beta.3", + "@angular-eslint/eslint-plugin": "^0.8.0-beta.3", + "@angular-eslint/eslint-plugin-template": "^0.8.0-beta.3", + "@angular-eslint/schematics": "^0.8.0-beta.3", + "@angular-eslint/template-parser": "^0.8.0-beta.3", + "@angular/cli": "^11.0.3", + "@angular/compiler-cli": "^11.0.3", + "@angular/language-service": "^11.0.3", "@types/jasmine": "~3.6.2", "@types/jasminewd2": "^2.0.3", - "@types/mathjs": "^6.0.7", - "@types/node": "^14.14.9", - "@typescript-eslint/eslint-plugin": "^4.8.1", - "@typescript-eslint/parser": "^4.8.1", - "codelyzer": "^6.0.0", + "@types/mathjs": "^6.0.8", + "@types/node": "^14.14.10", + "@typescript-eslint/eslint-plugin": "^4.9.0", + "@typescript-eslint/parser": "^4.9.0", "eslint": "^7.14.0", "eslint-config-airbnb-typescript": "^12.0.0", "eslint-config-prettier": "^6.15.0", "eslint-plugin-import": "^2.22.1", "eslint-plugin-jsdoc": "^30.7.8", + "eslint-plugin-prefer-arrow": "1.2.2", "husky": "^4.3.0", "jasmine-core": "~3.6.0", "jasmine-spec-reporter": "6.0.0", @@ -68,11 +68,11 @@ "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.5.0", - "lint-staged": "^10.5.1", - "prettier": "^2.2.0", + "lint-staged": "^10.5.3", + "prettier": "^2.2.1", "protractor": "~7.0.0", "standard-version": "^9.0.0", - "ts-node": "^9.0.0", + "ts-node": "^9.1.0", "typescript": "~4.0.5" }, "husky": { diff --git a/overlord/src/environments/environment.prod.ts b/overlord/src/environments/environment.prod.ts index 7c1f2383..ab787976 100644 --- a/overlord/src/environments/environment.prod.ts +++ b/overlord/src/environments/environment.prod.ts @@ -2,5 +2,5 @@ export const environment = { production: true, // eslint-disable-next-line @typescript-eslint/naming-convention ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry - version: '9.2.0', + version: '9.3.0', }; diff --git a/overlord/src/environments/environment.ts b/overlord/src/environments/environment.ts index e1b68cb9..d6f976e1 100644 --- a/overlord/src/environments/environment.ts +++ b/overlord/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { production: false, // eslint-disable-next-line @typescript-eslint/naming-convention ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry - version: '9.2.0', + version: '9.3.0', }; /*