@tomei/rental 0.16.1 → 0.16.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (65) hide show
  1. package/.commitlintrc.json +22 -22
  2. package/.gitlab-ci.yml +16 -16
  3. package/.husky/commit-msg +15 -15
  4. package/.husky/pre-commit +7 -7
  5. package/.prettierrc +4 -4
  6. package/Jenkinsfile +51 -51
  7. package/README.md +8 -8
  8. package/dist/src/components/agreement/agreement.js +8 -8
  9. package/dist/src/components/agreement/agreement.js.map +1 -1
  10. package/dist/src/components/rental/rental.js +15 -15
  11. package/dist/tsconfig.tsbuildinfo +1 -1
  12. package/eslint.config.mjs +58 -58
  13. package/jest.config.js +10 -10
  14. package/migrations/booking-table-migration.js +79 -79
  15. package/migrations/hirer-signature-table-migration.js +64 -64
  16. package/migrations/joint-hirer-table-migration.js +52 -52
  17. package/migrations/rental-aggreement-history-migration.js +41 -41
  18. package/migrations/rental-aggrement-table-migration.js +30 -30
  19. package/migrations/rental-price-table-migration.js +32 -32
  20. package/migrations/rental-table-migrations.js +96 -96
  21. package/package.json +75 -75
  22. package/sonar-project.properties +12 -12
  23. package/src/components/agreement/agreement.repository.ts +54 -54
  24. package/src/components/agreement/agreement.ts +180 -180
  25. package/src/components/agreement-history/agreement-history.repository.ts +54 -54
  26. package/src/components/agreement-history/agreement-history.ts +57 -57
  27. package/src/components/booking/booking.repository.ts +51 -51
  28. package/src/components/booking/booking.ts +492 -492
  29. package/src/components/hirer-signature/hirer-signature.repository.ts +54 -54
  30. package/src/components/hirer-signature/hirer-signature.ts +140 -140
  31. package/src/components/joint-hirer/joint-hirer.repository.ts +54 -54
  32. package/src/components/joint-hirer/joint-hirer.ts +137 -137
  33. package/src/components/rental/rental.repository.ts +51 -51
  34. package/src/components/rental/rental.ts +1116 -1116
  35. package/src/components/rental-price/rental-price.repository.ts +54 -54
  36. package/src/components/rental-price/rental-price.ts +100 -100
  37. package/src/database.ts +31 -31
  38. package/src/enum/account-type.enum.ts +4 -4
  39. package/src/enum/booking.enum.ts +5 -5
  40. package/src/enum/hirer-signature-status.enum.ts +4 -4
  41. package/src/enum/hirer-type.enum.ts +4 -4
  42. package/src/enum/index.ts +15 -15
  43. package/src/enum/rental-status.enum.ts +39 -39
  44. package/src/index.ts +36 -36
  45. package/src/interfaces/agreement-attr.interface.ts +7 -7
  46. package/src/interfaces/agreement-history-attr.interface.ts +7 -7
  47. package/src/interfaces/booking-attr.interface.ts +19 -19
  48. package/src/interfaces/booking-find-all-search-attr.interface.ts +12 -12
  49. package/src/interfaces/hirer-signature-attr.interface.ts +15 -15
  50. package/src/interfaces/index.ts +19 -19
  51. package/src/interfaces/joint-hirer-attr.interface.ts +10 -10
  52. package/src/interfaces/rental-attr.interface.ts +25 -25
  53. package/src/interfaces/rental-find-all-search-attr.interface.ts +11 -11
  54. package/src/interfaces/rental-price-attr.interface.ts +7 -7
  55. package/src/interfaces/response-hirer-signature-attr.interface.ts +15 -15
  56. package/src/models/agreement-history.entity.ts +51 -51
  57. package/src/models/agreement.entity.ts +47 -47
  58. package/src/models/booking.entity.ts +105 -105
  59. package/src/models/hirer-signature.entity.ts +81 -81
  60. package/src/models/index.ts +17 -17
  61. package/src/models/joint-hirer.entity.ts +63 -63
  62. package/src/models/rental-price.entity.ts +38 -38
  63. package/src/models/rental.entity.ts +133 -133
  64. package/tsconfig.build.json +5 -5
  65. package/tsconfig.json +24 -24
@@ -1,22 +1,22 @@
1
- {
2
- "extends": [
3
- "@commitlint/config-conventional"
4
- ],
5
- "rules": {
6
- "header-max-length": [ 2, "always", 120 ],
7
- "type-enum": [
8
- 2,
9
- "always",
10
- [
11
- "breaking",
12
- "feat",
13
- "fix",
14
- "refactor",
15
- "config",
16
- "test",
17
- "docs",
18
- "chore"
19
- ]
20
- ]
21
- }
22
- }
1
+ {
2
+ "extends": [
3
+ "@commitlint/config-conventional"
4
+ ],
5
+ "rules": {
6
+ "header-max-length": [ 2, "always", 120 ],
7
+ "type-enum": [
8
+ 2,
9
+ "always",
10
+ [
11
+ "breaking",
12
+ "feat",
13
+ "fix",
14
+ "refactor",
15
+ "config",
16
+ "test",
17
+ "docs",
18
+ "chore"
19
+ ]
20
+ ]
21
+ }
22
+ }
package/.gitlab-ci.yml CHANGED
@@ -1,16 +1,16 @@
1
- variables:
2
- SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache
3
- GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task
4
- sonarcloud-check:
5
- image:
6
- name: sonarsource/sonar-scanner-cli:latest
7
- entrypoint: [""]
8
- cache:
9
- key: "${CI_JOB_NAME}"
10
- paths:
11
- - .sonar/cache
12
- script:
13
- - sonar-scanner
14
- only:
15
- - merge_requests
16
- - main
1
+ variables:
2
+ SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache
3
+ GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task
4
+ sonarcloud-check:
5
+ image:
6
+ name: sonarsource/sonar-scanner-cli:latest
7
+ entrypoint: [""]
8
+ cache:
9
+ key: "${CI_JOB_NAME}"
10
+ paths:
11
+ - .sonar/cache
12
+ script:
13
+ - sonar-scanner
14
+ only:
15
+ - merge_requests
16
+ - main
package/.husky/commit-msg CHANGED
@@ -1,16 +1,16 @@
1
- #!/usr/bin/env sh
2
- . "$(dirname -- "$0")/_/husky.sh"
3
-
4
- npx commitlint --edit $1
5
- message="$(cat $1)"
6
- echo "$message"
7
- a=($(echo "$message" | tr ':' '\n'))
8
- echo "${a[0]}"
9
- if [ "${a[0]}" = "feat" ];
10
- then
11
- npm version --commit-hooks false --no-git-tag-version minor
12
- else
13
- npm version --commit-hooks false --no-git-tag-version patch
14
- fi
15
- git add .
1
+ #!/usr/bin/env sh
2
+ . "$(dirname -- "$0")/_/husky.sh"
3
+
4
+ npx commitlint --edit $1
5
+ message="$(cat $1)"
6
+ echo "$message"
7
+ a=($(echo "$message" | tr ':' '\n'))
8
+ echo "${a[0]}"
9
+ if [ "${a[0]}" = "feat" ];
10
+ then
11
+ npm version --commit-hooks false --no-git-tag-version minor
12
+ else
13
+ npm version --commit-hooks false --no-git-tag-version patch
14
+ fi
15
+ git add .
16
16
  git commit -m "$message" --no-verify
package/.husky/pre-commit CHANGED
@@ -1,7 +1,7 @@
1
- #!/usr/bin/env sh
2
- . "$(dirname -- "$0")/_/husky.sh"
3
-
4
- npm run lint
5
- npm run format
6
- npm run build
7
- git add .
1
+ #!/usr/bin/env sh
2
+ . "$(dirname -- "$0")/_/husky.sh"
3
+
4
+ npm run lint
5
+ npm run format
6
+ npm run build
7
+ git add .
package/.prettierrc CHANGED
@@ -1,5 +1,5 @@
1
- {
2
- "singleQuote": true,
3
- "trailingComma": "all",
4
- "endOfLine": "auto"
1
+ {
2
+ "singleQuote": true,
3
+ "trailingComma": "all",
4
+ "endOfLine": "auto"
5
5
  }
package/Jenkinsfile CHANGED
@@ -1,51 +1,51 @@
1
- pipeline {
2
- agent {
3
- kubernetes {
4
- label 'jenkins-agent'
5
- namespace 'devops-tools'
6
- }
7
- }
8
- tools {nodejs "node18"}
9
- stages {
10
- stage('Install') {
11
- steps {
12
- echo 'Install Dependencies..'
13
- sh 'npm install'
14
- }
15
- }
16
- stage('Test') {
17
- steps {
18
- echo 'Testing..'
19
- // sh 'npm run test'
20
- }
21
- }
22
- stage('Build') {
23
- steps {
24
- echo 'Building..'
25
- sh 'npm run build'
26
- }
27
- }
28
- stage('Publish') {
29
- steps {
30
- sh "npm publish"
31
- }
32
- }
33
- }
34
-
35
- post {
36
- success {
37
- script {
38
- def gitAuthor = sh(returnStdout: true, script: 'git log -1 --pretty=format:%an').trim()
39
- discordSend description: "Git Commit: ${env.GIT_COMMIT}\nGit Branch: ${env.GIT_BRANCH}\nGit URL: ${env.GIT_URL}\nGit Author: ${gitAuthor}", footer: '', image: '', link: env.BUILD_URL, result: 'SUCCESS', scmWebUrl: '', thumbnail: '', title: "${env.JOB_NAME} Build #${env.BUILD_NUMBER} Success", webhookURL: 'https://discord.com/api/webhooks/1166358157166125076/AquDPsQ6L5piq_TfiSfLGOujmVqgHhxfK8yVEfJZrWfhgT6g-j5gJ3xhuXGFZUjRhhlo'
40
- }
41
- }
42
-
43
- failure {
44
- script {
45
- def gitAuthor = sh(returnStdout: true, script: 'git log -1 --pretty=format:%an').trim()
46
- discordSend description: "Git Commit: ${env.GIT_COMMIT}\nGit Branch: ${env.GIT_BRANCH}\nGit URL: ${env.GIT_URL}\nGit Author: ${gitAuthor}", footer: '', image: '', link: env.BUILD_URL, result: 'FAILURE', scmWebUrl: '', thumbnail: '', title: "${env.JOB_NAME} Build #${env.BUILD_NUMBER} Failed", webhookURL: 'https://discord.com/api/webhooks/1166358157166125076/AquDPsQ6L5piq_TfiSfLGOujmVqgHhxfK8yVEfJZrWfhgT6g-j5gJ3xhuXGFZUjRhhlo'
47
- }
48
- }
49
- }
50
-
51
- }
1
+ pipeline {
2
+ agent {
3
+ kubernetes {
4
+ label 'jenkins-agent'
5
+ namespace 'devops-tools'
6
+ }
7
+ }
8
+ tools {nodejs "node18"}
9
+ stages {
10
+ stage('Install') {
11
+ steps {
12
+ echo 'Install Dependencies..'
13
+ sh 'npm install'
14
+ }
15
+ }
16
+ stage('Test') {
17
+ steps {
18
+ echo 'Testing..'
19
+ // sh 'npm run test'
20
+ }
21
+ }
22
+ stage('Build') {
23
+ steps {
24
+ echo 'Building..'
25
+ sh 'npm run build'
26
+ }
27
+ }
28
+ stage('Publish') {
29
+ steps {
30
+ sh "npm publish"
31
+ }
32
+ }
33
+ }
34
+
35
+ post {
36
+ success {
37
+ script {
38
+ def gitAuthor = sh(returnStdout: true, script: 'git log -1 --pretty=format:%an').trim()
39
+ discordSend description: "Git Commit: ${env.GIT_COMMIT}\nGit Branch: ${env.GIT_BRANCH}\nGit URL: ${env.GIT_URL}\nGit Author: ${gitAuthor}", footer: '', image: '', link: env.BUILD_URL, result: 'SUCCESS', scmWebUrl: '', thumbnail: '', title: "${env.JOB_NAME} Build #${env.BUILD_NUMBER} Success", webhookURL: 'https://discord.com/api/webhooks/1166358157166125076/AquDPsQ6L5piq_TfiSfLGOujmVqgHhxfK8yVEfJZrWfhgT6g-j5gJ3xhuXGFZUjRhhlo'
40
+ }
41
+ }
42
+
43
+ failure {
44
+ script {
45
+ def gitAuthor = sh(returnStdout: true, script: 'git log -1 --pretty=format:%an').trim()
46
+ discordSend description: "Git Commit: ${env.GIT_COMMIT}\nGit Branch: ${env.GIT_BRANCH}\nGit URL: ${env.GIT_URL}\nGit Author: ${gitAuthor}", footer: '', image: '', link: env.BUILD_URL, result: 'FAILURE', scmWebUrl: '', thumbnail: '', title: "${env.JOB_NAME} Build #${env.BUILD_NUMBER} Failed", webhookURL: 'https://discord.com/api/webhooks/1166358157166125076/AquDPsQ6L5piq_TfiSfLGOujmVqgHhxfK8yVEfJZrWfhgT6g-j5gJ3xhuXGFZUjRhhlo'
47
+ }
48
+ }
49
+ }
50
+
51
+ }
package/README.md CHANGED
@@ -1,8 +1,8 @@
1
- ## Package Template
2
-
3
- ### How to use
4
- - run `npm i`
5
- - create a `components` folder in the root of your project
6
-
7
-
8
-
1
+ ## Package Template
2
+
3
+ ### How to use
4
+ - run `npm i`
5
+ - create a `components` folder in the root of your project
6
+
7
+
8
+
@@ -61,13 +61,13 @@ class Agreement extends general_1.ObjectBase {
61
61
  if (!agreementNo) {
62
62
  throw new general_1.ClassError('AgreementNo', 'AgreementNoErrMsg01', 'AgreementNo is missing');
63
63
  }
64
- const query = `
65
- SELECT
66
- hs.*,
67
- FROM
68
- rental_HirerSignature hs
69
- WHERE
70
- hs.AgreementNo = '${agreementNo}'
64
+ const query = `
65
+ SELECT
66
+ hs.*
67
+ FROM
68
+ rental_HirerSignature hs
69
+ WHERE
70
+ hs.AgreementNo = '${agreementNo}'
71
71
  `;
72
72
  const db = rentalDb.getConnection();
73
73
  const signatures = yield db.query(query, {
@@ -91,7 +91,7 @@ class Agreement extends general_1.ObjectBase {
91
91
  }
92
92
  const activities = yield Agreement._AgreementHistoryRepo.findAll({
93
93
  where: { AgreementNo: this.ObjectId },
94
- order: [['Date', 'DESC']],
94
+ order: [['CreatedAt', 'DESC']],
95
95
  transaction: dbTransaction,
96
96
  });
97
97
  return activities;
@@ -1 +1 @@
1
- {"version":3,"file":"agreement.js","sourceRoot":"","sources":["../../../../src/components/agreement/agreement.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"agreement.js","sourceRoot":"","sources":["../../../../src/components/agreement/agreement.ts"],"names":[],"mappings":"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"}
@@ -438,21 +438,21 @@ class Rental extends general_1.ObjectBase {
438
438
  if (!isPrivileged) {
439
439
  throw new general_1.ClassError('Rental', 'RentalErrMsg01', "You do not have 'Rental - View' privilege.");
440
440
  }
441
- const query = `
442
- SELECT
443
- r.*
444
- FROM
445
- rental_Rental r
446
- LEFT JOIN
447
- rental_JointHirer jh ON r.RentalId = jh.RentalId
448
- WHERE
449
- r.Status = 'Active'
450
- AND (
451
- r.CustomerId = '${CustomerId}'
452
- OR jh.CustomerId = '${CustomerId}'
453
- )
454
- GROUP BY
455
- r.RentalId
441
+ const query = `
442
+ SELECT
443
+ r.*
444
+ FROM
445
+ rental_Rental r
446
+ LEFT JOIN
447
+ rental_JointHirer jh ON r.RentalId = jh.RentalId
448
+ WHERE
449
+ r.Status = 'Active'
450
+ AND (
451
+ r.CustomerId = '${CustomerId}'
452
+ OR jh.CustomerId = '${CustomerId}'
453
+ )
454
+ GROUP BY
455
+ r.RentalId
456
456
  `;
457
457
  const db = rentalDb.getConnection();
458
458
  const result = yield db.query(query, {