@tomei/rental 0.17.9-test.2 → 0.18.0-staging.1

package/.commitlintrc.json

@@ -1,23 +1,23 @@
-{
-  "extends": [
-    "@commitlint/config-conventional"
-  ],
-  "rules": {
-    "header-max-length": [ 2, "always", 120 ],
-    "type-enum": [
-      2,
-      "always",
-      [
-        "breaking",
-        "feat",
-        "fix",
-        "refactor",
-        "config",
-        "test",
-        "docs",
-        "chore",
-        "release"
-      ]
-    ]
-  }
-}
+{
+  "extends": [
+    "@commitlint/config-conventional"
+  ],
+  "rules": {
+    "header-max-length": [ 2, "always", 120 ],
+    "type-enum": [
+      2,
+      "always",
+      [
+        "breaking",
+        "feat",
+        "fix",
+        "refactor",
+        "config",
+        "test",
+        "docs",
+        "chore",
+        "release"
+      ]
+    ]
+  }
+}

package/.gitlab-ci.yml

@@ -1,234 +1,16 @@
-# ============================================================
-# .gitlab-ci.yml — npm package with trusted publishing (OIDC)
-#
-# Project path: all-tomei-projects/tomei-package/General/<package-name>
-#
-# Tag patterns:
-#   test-vX.Y.Z-rc.N     → npm publish --tag test    (RC for test env)
-#   staging-vX.Y.Z-rc.N  → npm publish --tag staging (RC for staging env)
-#   prod-vX.Y.Z          → npm publish --tag latest  (production, manual gate)
-#   prod-vX.Y.Z-hotfix.N → npm publish --tag latest  (hotfix, manual gate)
-#
-# No NPM_TOKEN secret needed — OIDC trusted publishing only.
-#
-# Required CI/CD variables (Settings → CI/CD → Variables):
-#   DISCORD_WEBHOOK  — Discord incoming webhook URL (masked)
-#
-# npm side setup required (npmjs.com):
-#   1. package.json → publishConfig.provenance: true
-#   2. npmjs.com → package Settings → Publishing Access
-#      → Enable OIDC publishing for GitLab project:
-#        all-tomei-projects/tomei-package/General/<package-name>
-# ============================================================
-default:
-  image: node:20-alpine
-
-stages:
-  - validate
-  - build
-  - publish
-  - notify
-
-# ────────────────────────────────────────────────────────────
-# STAGE: validate
-# Runs lint and unit tests before publish
-# Skipped on prod tags — code already validated on test + staging
-# ────────────────────────────────────────────────────────────
-lint:
-  stage: validate
-  cache:
-    key: node-$CI_COMMIT_REF_SLUG
-    paths: [node_modules/]
-  script:
-    - npm ci
-    - npm run lint
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^test-v/'
-    - if: '$CI_COMMIT_TAG =~ /^staging-v/'
-
-unit-test:
-  stage: validate
-  cache:
-    key: node-$CI_COMMIT_REF_SLUG
-    paths: [node_modules/]
-  script:
-    - npm ci
-    - npm test
-  coverage: '/Lines\s*:\s*(\d+\.?\d*)%/'
-  artifacts:
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage/cobertura-coverage.xml
-    expire_in: 7 days
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^test-v/'
-    - if: '$CI_COMMIT_TAG =~ /^staging-v/'
-
-# ────────────────────────────────────────────────────────────
-# STAGE: build
-# Compiles the package (tsc / rollup / whatever your build uses)
-# Artifacts passed to publish jobs
-# Runs on all tag patterns
-# ────────────────────────────────────────────────────────────
-build:
-  stage: build
-  cache:
-    key: node-$CI_COMMIT_REF_SLUG
-    paths: [node_modules/]
-  script:
-    - npm ci
-    - npm run build
-  artifacts:
-    paths:
-      - dist/
-    expire_in: 1 hour
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^test-v/'
-    - if: '$CI_COMMIT_TAG =~ /^staging-v/'
-    - if: '$CI_COMMIT_TAG =~ /^prod-v/'
-
-# ────────────────────────────────────────────────────────────
-# STAGE: publish — test RC
-# Triggered by: test-vX.Y.Z-rc.N tag
-# Publishes with dist-tag "test"
-# Consumers must opt in: npm install @tomei/pkg@test
-# Version stamped: test-v1.24.0-rc.1 → 1.24.0-rc.1
-# ────────────────────────────────────────────────────────────
-publish-test:
-  stage: publish
-  needs: [build]
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^test-v/'
-  script:
-    - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
-    - |
-      RC_VERSION=$(echo "$CI_COMMIT_TAG" | sed 's/^test-v\([0-9.]*\)-rc\.\([0-9]*\)$/\1-test.\2/')
-      echo "Publishing version $RC_VERSION with dist-tag: test"
-      npm version "$RC_VERSION" --no-git-tag-version --ignore-scripts --force
-      npm publish --tag test --access public
-      echo "Published: @$(node -p "require('./package.json').name")@$RC_VERSION [test]"
-
-# ────────────────────────────────────────────────────────────
-# STAGE: publish — staging RC
-# Triggered by: staging-vX.Y.Z-rc.N tag
-# Publishes with dist-tag "staging"
-# Consumers must opt in: npm install @tomei/pkg@staging
-# Version stamped: staging-v1.24.0-rc.1 → 1.24.0-rc.1
-# ────────────────────────────────────────────────────────────
-publish-staging:
-  stage: publish
-  needs: [build]
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^staging-v/'
-  script:
-    - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
-    - |
-      RC_VERSION=$(echo "$CI_COMMIT_TAG" | sed 's/^staging-v\([0-9.]*\)-rc\.\([0-9]*\)$/\1-staging.\2/')
-      echo "Publishing version $RC_VERSION with dist-tag: staging"
-      npm version "$RC_VERSION" --no-git-tag-version --ignore-scripts --force
-      npm publish --tag staging --access public
-      echo "Published: @$(node -p "require('./package.json').name")@$RC_VERSION [staging]"
-
-# ────────────────────────────────────────────────────────────
-# STAGE: publish — production
-# Triggered by: prod-vX.Y.Z or prod-vX.Y.Z-hotfix.N tag (from main only)
-# Publishes with dist-tag "latest" — becomes the default install version
-# Manual gate — human must click Play in GitLab pipeline UI
-# Version stamped: prod-v2.2.0 → 2.2.0 | prod-v2.2.0-hotfix.1 → 2.2.0-hotfix.1
-# ────────────────────────────────────────────────────────────
-publish-prod:
-  stage: publish
-  needs: [build]
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^prod-v/'
-      when: manual
-      allow_failure: false
-  script:
-    - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
-    - |
-      PROD_VERSION=$(echo "$CI_COMMIT_TAG" | sed 's/^prod-v//')
-      echo "Publishing version $PROD_VERSION with dist-tag: latest"
-      npm version "$PROD_VERSION" --no-git-tag-version --ignore-scripts --force
-      npm publish --tag latest --access public
-      echo "Published: @$(node -p "require('./package.json').name")@$PROD_VERSION [latest]"
-      echo "Pipeline: $CI_PIPELINE_URL"
-
-# ────────────────────────────────────────────────────────────
-# STAGE: notify — success
-# ────────────────────────────────────────────────────────────
-notify-success:
-  stage: notify
-  image: curlimages/curl:latest
-  needs:
-    - job: publish-test
-      optional: true
-    - job: publish-staging
-      optional: true
-    - job: publish-prod
-      optional: true
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^test-v/'
-      when: on_success
-    - if: '$CI_COMMIT_TAG =~ /^staging-v/'
-      when: on_success
-    - if: '$CI_COMMIT_TAG =~ /^prod-v/'
-      when: on_success
-  script:
-    - |
-      if echo "$CI_COMMIT_TAG" | grep -q "^test-v"; then
-        DIST_TAG="test"
-        COLOR=3066993
-      elif echo "$CI_COMMIT_TAG" | grep -q "^staging-v"; then
-        DIST_TAG="staging"
-        COLOR=16776960
-      elif echo "$CI_COMMIT_TAG" | grep -q "^prod-v"; then
-        DIST_TAG="latest"
-        COLOR=3066993
-      fi
-
-      curl -s -X POST "$DISCORD_WEBHOOK" \
-        -H "Content-Type: application/json" \
-        -d '{
-          "embeds": [{
-            "title": "Package published successfully",
-            "color": '"$COLOR"',
-            "fields": [
-              {"name": "Package",      "value": "'"$CI_PROJECT_NAME"'",  "inline": true},
-              {"name": "Tag",          "value": "'"$CI_COMMIT_TAG"'",    "inline": true},
-              {"name": "Dist-tag",     "value": "'"$DIST_TAG"'",         "inline": true},
-              {"name": "Published by", "value": "'"$GITLAB_USER_NAME"'", "inline": true},
-              {"name": "Pipeline",     "value": "'"$CI_PIPELINE_URL"'",  "inline": false}
-            ]
-          }]
-        }'
-
-# ────────────────────────────────────────────────────────────
-# STAGE: notify — failure
-# ────────────────────────────────────────────────────────────
-notify-failure:
-  stage: notify
-  image: curlimages/curl:latest
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^test-v/'
-      when: on_failure
-    - if: '$CI_COMMIT_TAG =~ /^staging-v/'
-      when: on_failure
-    - if: '$CI_COMMIT_TAG =~ /^prod-v/'
-      when: on_failure
-  script:
-    - |
-      curl -s -X POST "$DISCORD_WEBHOOK" \
-        -H "Content-Type: application/json" \
-        -d '{
-          "embeds": [{
-            "title": "Package publish FAILED",
-            "color": 15158332,
-            "fields": [
-              {"name": "Package",    "value": "'"$CI_PROJECT_NAME"'",  "inline": true},
-              {"name": "Tag",        "value": "'"$CI_COMMIT_TAG"'",    "inline": true},
-              {"name": "Failed by",  "value": "'"$GITLAB_USER_NAME"'", "inline": true},
-              {"name": "Pipeline",   "value": "'"$CI_PIPELINE_URL"'",  "inline": false}
-            ]
-          }]
-        }'
+variables:
+  SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
+  GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
+sonarcloud-check:
+  image:
+    name: sonarsource/sonar-scanner-cli:latest
+    entrypoint: [""]
+  cache:
+    key: "${CI_JOB_NAME}"
+    paths:
+      - .sonar/cache
+  script:
+    - sonar-scanner
+  only:
+    - merge_requests
+    - main

package/.husky/commit-msg

@@ -1,4 +1,10 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx commitlint --edit $1
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx commitlint --edit $1
+message="$(cat $1)"
+echo "$message"
+a=($(echo "$message" | tr ':' '\n'))
+echo "${a[0]}"
+git add .
+git commit -m "$message" --no-verify

package/.husky/pre-commit

@@ -1,12 +1,7 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-STAGED=$(git diff --cached --name-only --diff-filter=ACMR)
-
-npm run lint
-npm run format
-npm run build
-
-if [ -n "$STAGED" ]; then
-  echo "$STAGED" | xargs git add
-fi
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm run lint
+npm run format
+npm run build
+git add .

package/.prettierrc

@@ -1,5 +1,5 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all",
-  "endOfLine": "auto"
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "endOfLine": "auto"
 }

package/CHANGELOG.md

@@ -1,9 +1,9 @@
-# :package: Release Notes – `v0.17.8`
-**Release Date:** 02nd March 2026  
-**Version:** `v0.17.8`
-
----
-
-## :bug: Bug Fixes
-- **Rental Cancellation – Active and Suspended Status Removed**  
+# :package: Release Notes – `v0.17.8`
+**Release Date:** 02nd March 2026  
+**Version:** `v0.17.8`
+
+---
+
+## :bug: Bug Fixes
+- **Rental Cancellation – Active and Suspended Status Removed**  
   Removed rental status validation during the rental cancellation process, allowing rentals with Active and Suspended status to be cancelled without restriction.

package/Jenkinsfile

@@ -1,51 +1,51 @@
-pipeline {
-    agent {
-        kubernetes {
-            label 'jenkins-agent'
-            namespace 'devops-tools'
-        }
-    }
-    tools {nodejs "node18"}
-    stages {
-        stage('Install') {
-            steps {
-                echo 'Install Dependencies..'
-                sh 'npm install'
-            }
-        }
-        stage('Test') {
-            steps {
-                echo 'Testing..'
-                // sh 'npm run test'
-            }
-        }
-        stage('Build') {
-            steps {
-                echo 'Building..'
-                sh 'npm run build'
-            }
-        }
-        stage('Publish') {
-            steps {
-                sh "npm publish"
-            }
-        }
-    }
-
-    post {
-        success {
-            script {
-                def gitAuthor = sh(returnStdout: true, script: 'git log -1 --pretty=format:%an').trim()
-                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'
-            }
-        }
-
-        failure {
-            script {
-                def gitAuthor = sh(returnStdout: true, script: 'git log -1 --pretty=format:%an').trim()
-                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'
-            }
-        }
-    } 
-
-}
+pipeline {
+    agent {
+        kubernetes {
+            label 'jenkins-agent'
+            namespace 'devops-tools'
+        }
+    }
+    tools {nodejs "node18"}
+    stages {
+        stage('Install') {
+            steps {
+                echo 'Install Dependencies..'
+                sh 'npm install'
+            }
+        }
+        stage('Test') {
+            steps {
+                echo 'Testing..'
+                // sh 'npm run test'
+            }
+        }
+        stage('Build') {
+            steps {
+                echo 'Building..'
+                sh 'npm run build'
+            }
+        }
+        stage('Publish') {
+            steps {
+                sh "npm publish"
+            }
+        }
+    }
+
+    post {
+        success {
+            script {
+                def gitAuthor = sh(returnStdout: true, script: 'git log -1 --pretty=format:%an').trim()
+                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'
+            }
+        }
+
+        failure {
+            script {
+                def gitAuthor = sh(returnStdout: true, script: 'git log -1 --pretty=format:%an').trim()
+                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'
+            }
+        }
+    } 
+
+}

package/README.md

@@ -1,8 +1,8 @@
-## Package Template
-
-### How to use
-- run `npm i`
-- create a `components` folder in the root of your project
-
-
-
+## Package Template
+
+### How to use
+- run `npm i`
+- create a `components` folder in the root of your project
+
+
+

package/dist/src/components/agreement/agreement.d.ts

@@ -23,6 +23,5 @@ export declare class Agreement extends ObjectBase {
     static init(agreementNo?: string, dbTransaction?: any): Promise<Agreement>;
     static getSignatureList(loginUser: LoginUser, agreementNo: string, dbTransaction: any): Promise<IResponseAgreementSignature[]>;
     getAllActivities(loginUser: LoginUser, dbTransaction?: any): Promise<IAgreementHistoryAttr[]>;
-    expire(): void;
     createActivity(activityCompleted: string, MediaId: string, dbTransaction: any, loginUser: LoginUser): Promise<IAgreementHistoryAttr>;
 }

package/dist/src/components/agreement/agreement.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Agreement = void 0;
 const general_1 = require("@tomei/general");
-const aggrement_status_enum_1 = require("../../enum/aggrement-status.enum");
 const agreement_repository_1 = require("./agreement.repository");
 const config_1 = require("@tomei/config");
 const agreement_signature_repository_1 = require("../agreement-signature/agreement-signature.repository");
@@ -62,15 +61,15 @@ class Agreement extends general_1.ObjectBase {
                 if (!agreementNo) {
                     throw new general_1.ClassError('AgreementNo', 'AgreementNoErrMsg01', 'AgreementNo is missing');
                 }
-                const query = `
-            SELECT 
-                hs.*
-            FROM 
-                rental_AgreementSignature hs          
-            WHERE 
-                hs.AgreementNo = '${agreementNo}'
-            ORDER BY
-                hs.CreatedAt ASC
+                const query = `
+            SELECT 
+                hs.*
+            FROM 
+                rental_AgreementSignature hs          
+            WHERE 
+                hs.AgreementNo = '${agreementNo}'
+            ORDER BY
+                hs.CreatedAt ASC
       `;
                 const db = rentalDb.getConnection();
                 const signatures = yield db.query(query, {
@@ -104,9 +103,6 @@ class Agreement extends general_1.ObjectBase {
             }
         });
     }
-    expire() {
-        this.Status = aggrement_status_enum_1.AggrementStatusEnum.EXPIRED;
-    }
     createActivity(activityCompleted, MediaId, dbTransaction, loginUser) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/src/components/agreement/agreement.js.map

@@ -1 +1 @@
-{"version":3,"file":"agreement.js","sourceRoot":"","sources":["../../../../src/components/agreement/agreement.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agreement.js","sourceRoot":"","sources":["../../../../src/components/agreement/agreement.ts"],"names":[],"mappings":"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"}

package/dist/src/components/rental/rental.d.ts

@@ -69,6 +69,5 @@ export declare class Rental extends ObjectBase {
     getInvoices(loginUser: LoginUser, dbTransaction: any, accountingSystem?: IAccountSystem): Promise<Document[]>;
     getItem(dbTransaction: any): Promise<any>;
     cancel(loginUser: LoginUser, dbTransaction: any, remarks: string): Promise<Rental>;
-    terminate(remarks: string): Rental;
     update(loginUser: LoginUser, dbTransaction: any, updates: Partial<IRentalAttr>): Promise<Rental>;
 }

package/dist/src/components/rental/rental.js

@@ -451,21 +451,21 @@ class Rental extends general_1.ObjectBase {
                 if (!isPrivileged) {
                     throw new general_1.ClassError('Rental', 'RentalErrMsg01', "You do not have 'Rental - View' privilege.");
                 }
-                const query = `
-      SELECT 
-          r.*
-      FROM 
-          rental_Rental r
-      LEFT JOIN 
-          rental_JointHirer jh ON r.RentalId = jh.RentalId
-      WHERE 
-          r.Status = 'Active'
-          AND (
-              r.CustomerId = '${CustomerId}' 
-              OR jh.CustomerId = '${CustomerId}'
-          )
-      GROUP BY
-          r.RentalId
+                const query = `
+      SELECT 
+          r.*
+      FROM 
+          rental_Rental r
+      LEFT JOIN 
+          rental_JointHirer jh ON r.RentalId = jh.RentalId
+      WHERE 
+          r.Status = 'Active'
+          AND (
+              r.CustomerId = '${CustomerId}' 
+              OR jh.CustomerId = '${CustomerId}'
+          )
+      GROUP BY
+          r.RentalId
       `;
                 const db = rentalDb.getConnection();
                 const result = yield db.query(query, {
@@ -877,20 +877,6 @@ class Rental extends general_1.ObjectBase {
             }
         });
     }
-    terminate(remarks) {
-        if (!this.ObjectId) {
-            throw new general_1.ClassError('Rental', 'RentalErrMsg01', 'Rental not found. Rental Id is empty.');
-        }
-        if (this.Status === rental_status_enum_1.RentalStatusEnum.TERMINATED) {
-            throw new general_1.ClassError('Rental', 'RentalErrMsg01', 'Rental is already terminated.');
-        }
-        if (!remarks) {
-            throw new general_1.ClassError('Rental', 'RentalErrMsg01', 'Termination remarks is required.');
-        }
-        this._Status = rental_status_enum_1.RentalStatusEnum.TERMINATED;
-        this.TerminateRemarks = remarks;
-        return this;
-    }
     update(loginUser, dbTransaction, updates) {
         return __awaiter(this, void 0, void 0, function* () {
             try {