@7365admin1/module-hygiene 4.27.1 → 4.27.2-staging.4

package/.github/workflows/publish-staging.yml

@@ -0,0 +1,36 @@
+name: Publish Staging
+on:
+  push:
+    branches:
+      - staging
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+          cache: "yarn"
+          cache-dependency-path: yarn.lock
+
+      - run: yarn install --immutable
+
+      - run: yarn build
+
+      - name: Create .npmrc for publishing
+        run: |
+          echo '//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}' > ~/.npmrc
+
+      - name: Set staging prerelease version
+        run: |
+          BASE=$(node -p "const [x,y,z]=require('./package.json').version.split('-')[0].split('.'); [x,y,+z+1].join('.')")
+          npm version "$BASE-staging.${{ github.run_number }}" --no-git-tag-version
+          node -p "'Publishing ' + require('./package.json').version"
+
+      - name: Publish to npm with staging tag
+        run: npm publish --tag staging --registry https://registry.npmjs.org

package/dist/index.js

@@ -3314,7 +3314,19 @@ function useAreaChecklistRepo() {
   }
   async function createUniqueIndex() {
     try {
-      await collection.createIndex({ schedule: 1, area: 1 }, { unique: true });
+      await collection.createIndex(
+        { schedule: 1, area: 1, serviceType: 1 },
+        { unique: true }
+      );
+      const legacyIndex = (await collection.indexes()).find((index) => {
+        return index.unique === true && JSON.stringify(index.key) === JSON.stringify({ schedule: 1, area: 1 });
+      });
+      if (legacyIndex?.name) {
+        await collection.dropIndex(legacyIndex.name);
+        import_node_server_utils17.logger.info(
+          `Dropped legacy hygiene area checklist unique index: ${legacyIndex.name}`
+        );
+      }
     } catch (error) {
       throw new import_node_server_utils17.InternalServerError(
         "Failed to create unique index on hygiene checklist area."
@@ -3326,7 +3338,7 @@ function useAreaChecklistRepo() {
       const parentChecklistId = new import_mongodb9.ObjectId(value.schedule);
       const areaId = new import_mongodb9.ObjectId(value.area);
       const existingChecklist = await collection.findOne(
-        { schedule: parentChecklistId, area: areaId },
+        { schedule: parentChecklistId, area: areaId, serviceType: value.serviceType },
         { session }
       );
       if (existingChecklist) {
@@ -3344,7 +3356,8 @@ function useAreaChecklistRepo() {
         import_node_server_utils17.logger.info(`Duplicate area checklist skipped for area ${value.name}`);
         const existing = await collection.findOne({
           schedule: new import_mongodb9.ObjectId(value.schedule),
-          area: new import_mongodb9.ObjectId(value.area)
+          area: new import_mongodb9.ObjectId(value.area),
+          serviceType: value.serviceType
         });
         return existing._id;
       }
@@ -5180,9 +5193,18 @@ function useSupplyRepository() {
   async function createUniqueIndex() {
     try {
       await collection.createIndex(
-        { site: 1, name: 1, deletedAt: 1 },
+        { site: 1, serviceType: 1, name: 1, deletedAt: 1 },
         { unique: true }
       );
+      const legacyIndex = (await collection.indexes()).find((index) => {
+        return index.unique === true && JSON.stringify(index.key) === JSON.stringify({ site: 1, name: 1, deletedAt: 1 });
+      });
+      if (legacyIndex?.name) {
+        await collection.dropIndex(legacyIndex.name);
+        import_node_server_utils22.logger.info(
+          `Dropped legacy hygiene supply unique index: ${legacyIndex.name}`
+        );
+      }
     } catch (error) {
       throw new import_node_server_utils22.InternalServerError(
         "Failed to create unique index on hygiene supply."