Skip to content
This repository has been archived by the owner on Jan 10, 2025. It is now read-only.

Commit

Permalink
Merge master-qa (#3516)
Browse files Browse the repository at this point in the history
* Billing simple authorization check

* Migrate taxes

* Invoice migration

* Invoice migration
- Use auth definition and remove admin
- Add params in invoice storage get
- Add authorizations functions check and refactoring

* Payment methos migration + add flags
- Enforce own user authorization filter for payment
- Create flag auth depends on the user that is beeing modified
- Adapt auth definition for payment method requirement
- Add flags for the GUI

* Migrate download billing invoice

* Billing setting migration

* Clean & lint

* Including connectorID in site area chart consumption while averaging minute data.

* Fixed typo in logs

* Bumped version

* Bump ajv from 8.8.2 to 8.11.0

Bumps [ajv](https://github.com/ajv-validator/ajv) from 8.8.2 to 8.11.0.
- [Release notes](https://github.com/ajv-validator/ajv/releases)
- [Commits](ajv-validator/ajv@v8.8.2...v8.11.0)

---
updated-dependencies:
- dependency-name: ajv
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Refactor

- Add appropriate projectfield in action auth
- remove 'custom' projectField creation and use auth def
- remove user fields for basic user since not authorized

* Bump ts-node from 10.4.0 to 10.7.0

Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 10.4.0 to 10.7.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Commits](TypeStrong/ts-node@v10.4.0...v10.7.0)

---
updated-dependencies:
- dependency-name: ts-node
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump webpack-cli from 4.9.1 to 4.9.2

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.9.1 to 4.9.2.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/[email protected]@4.9.2)

---
updated-dependencies:
- dependency-name: webpack-cli
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* invoices - minor changes

* Bump body-parser from 1.19.1 to 1.20.0

Bumps [body-parser](https://github.com/expressjs/body-parser) from 1.19.1 to 1.20.0.
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](expressjs/body-parser@1.19.1...1.20.0)

---
updated-dependencies:
- dependency-name: body-parser
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump webpack from 5.67.0 to 5.72.0

Bumps [webpack](https://github.com/webpack/webpack) from 5.67.0 to 5.72.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v5.67.0...v5.72.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump chai from 4.3.4 to 4.3.6

Bumps [chai](https://github.com/chaijs/chai) from 4.3.4 to 4.3.6.
- [Release notes](https://github.com/chaijs/chai/releases)
- [Changelog](https://github.com/chaijs/chai/blob/4.x.x/History.md)
- [Commits](chaijs/chai@v4.3.4...v4.3.6)

---
updated-dependencies:
- dependency-name: chai
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump object-sizeof from 1.6.1 to 1.6.3

Bumps [object-sizeof](https://github.com/miktam/sizeof) from 1.6.1 to 1.6.3.
- [Release notes](https://github.com/miktam/sizeof/releases)
- [Commits](https://github.com/miktam/sizeof/commits)

---
updated-dependencies:
- dependency-name: object-sizeof
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump @types/validator from 13.7.0 to 13.7.2

Bumps [@types/validator](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/validator) from 13.7.0 to 13.7.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/validator)

---
updated-dependencies:
- dependency-name: "@types/validator"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Clean up unecessary auth checks in service classes

* amperage limit - wrong value when set to zero

* amperage limit

* Do not throw auth exception on lists

* Avoid uncatched exceptions in import users/badges and in OCPI remote start/stop session

* Fixed typos

* payment methods - limit is not mandatory

* Soft stop external transactions

* payment methods - default limit value

* Bump moment from 2.29.2 to 2.29.3

Bumps [moment](https://github.com/moment/moment) from 2.29.2 to 2.29.3.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/2.29.3/CHANGELOG.md)
- [Commits](moment/moment@2.29.2...2.29.3)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump convict from 6.2.1 to 6.2.2

Bumps [convict](https://github.com/mozilla/node-convict) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/mozilla/node-convict/releases)
- [Changelog](https://github.com/mozilla/node-convict/blob/master/CHANGELOG.md)
- [Commits](mozilla/node-convict@v6.2.1...v6.2.2)

---
updated-dependencies:
- dependency-name: convict
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

* billing - payment methods - no limit

* Double the number of min DB connections

* Removed @typescript-eslint/no-misused-promise in routes

* Updated sub-modules

* Updated sub-modules

* Removed Firebase databaseURL property
Updated sub-modules

* Removed unused property

* Updated VSCode recommandations

* Added quicktype VSCode recommandation

* Fixed typos

* Changed OCPI Charging to Preparing when OCPP is Available

* Fixed OCPI Remote Start creates RFID Card on the fly

* Never calculate the cost of an OCPI transaction

* Renamed Loggings routes/types to Logs

* Fixed UTs

* Fixed typo

* pricing - do not price roaming sessions (#3500)

* pricing - do not price roaming sessions

* pricing - user must be provided

Co-authored-by: FABIANO Serge <[email protected]>

* Validate OCPP Meter Values with Json schema (#3458)

* add json meter values request

* this.validate meter values in occpvalidation

* meterValue, Validator schema for 1.6, had to test for 1.5

* this is how it works for me

* final meter value request

* split validator

* split again ocpp json schema

* deleted one step in OCPP16Array schema

* split array and object validation for occp15 + default value

* added required and $id

* No need to have a dedicated OCPP json file

* delete the useless "convert to int" and set default

* Validation transaction ID === 0

* Put back the check of the Transaction ID > 0 on connector

Co-authored-by: BANCHEREAU Caroline <[email protected]>
Co-authored-by: LucasBrazi06 <[email protected]>

* Removed circular deps
Removed unused indexes

* putting back code lost after a merge

* Put back userID DB index in tags collection

* Fixed auth exception check in Site Area create endpoint

* Ensured OCPP Heartbeart body is correct when validated with a Json schema

* Avoid NPE in OCPP response

* Added UTs for organizations (#3417)

* site area tests

* add site Area Org script package.json

* Sites tests

* Assets, Charging stations, Transactions and Consumption should be aligned with organizations entities

* Assets, Charging stations and transactions should be aligned with organizations entities

* Run AlignEntitiesWithOrganizationIDsTask again.

* fix test error

* fix test again

* Specify all needed fields of a method (golden rule)

Co-authored-by: mahdibenromdhane <[email protected]>
Co-authored-by: ClaudeROSSI <[email protected]>
Co-authored-by: LucasBrazi06 <[email protected]>

* Update lastUpdateBy projected field (#3508)

* Update projected fields

* Align lastchangedby projected field

- only return firstName and name

* createdby prjected field update (#3510)

* Updated sub-modules

* Updated sub-modules

* Do not update Charging Station max power in master/slave

* Put back the fucking name 'vscode-jest-tests' to debug with Jest

* Removed useless service utils checks (#3511)

* refactor: removed useless checks

* refactor: removed useless object structure checks

* refactor: reduced useless inner methods checks

Co-authored-by: LucasBrazi06 <[email protected]>

* Optimized load consumptions in MongoDB  (#3388)

* Mongodb changes

* Additional changes

* Changing variable names

* Variable again!!

* Test case changes

* fix tests

* fix tests

Co-authored-by: Claude ROSSI <[email protected]>

* Updated sub-modules

* Updated sub-modules

* Removed useless trials in Applying Charging Profiles notification

* Fixed typos

Co-authored-by: Ramzi Siala <[email protected]>
Co-authored-by: Rohan Antony <[email protected]>
Co-authored-by: ClaudeROSSI <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: mahdibenromdhane <[email protected]>
Co-authored-by: melvyndubois <[email protected]>
Co-authored-by: BANCHEREAU Caroline <[email protected]>
Co-authored-by: mahdibenromdhane <[email protected]>
Co-authored-by: Loan Alouache <[email protected]>
  • Loading branch information
10 people authored May 9, 2022
1 parent cb59ecc commit 663d02c
Show file tree
Hide file tree
Showing 127 changed files with 2,708 additions and 2,506 deletions.
18 changes: 15 additions & 3 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,20 @@
"codezombiech.gitignore",
"dbaeumer.vscode-eslint",
"eamodio.gitlens",
"EditorConfig.EditorConfig",
"editorconfig.editorconfig",
"ms-azuretools.vscode-docker",
"streetsidesoftware.code-spell-checker"
"streetsidesoftware.code-spell-checker",
"formulahendry.auto-rename-tag",
"naumovs.color-highlight",
"l13rary.l13-diff",
"orta.vscode-jest",
"sonarsource.sonarlint-vscode",
"hbenl.vscode-test-explorer",
"gruntfuggly.todo-tree",
"chakrounanas.turbo-console-log",
"adamhartford.vscode-base64",
"redhat.vscode-yaml",
"christian-kohler.npm-intellisense",
"quicktype.quicktype"
]
}
}
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"configurations": [
{
"type": "node",
"name": "Run all Tests",
"name": "vscode-jest-tests",
"request": "launch",
"program": "${workspaceFolder}/node_modules/.bin/jest",
"args": [
Expand Down
Loading

0 comments on commit 663d02c

Please sign in to comment.