Merge pull request #258 from d-rec/develop

Dev to Stage Push
d-rec · May 22, 2024 · 9f1a323 · 9f1a323
2 parents a94d2d1 + c8ab456
commit 9f1a323
Show file tree

Hide file tree

Showing 119 changed files with 4,997 additions and 1,473 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Install tooling
         run: |
           npm i -g @microsoft/rush
-          npm i -g pnpm@6
+          npm i -g pnpm@7
 
       - name: Install drec-origin
         run: |
@@ -47,13 +47,17 @@ jobs:
       - name: Install tooling
         run: |
           npm i -g @microsoft/rush
-          npm i -g pnpm@6
+          npm i -g pnpm@7
 
       - name: Install drec-origin
         run: |
           rush install
 
-      - name: Run ESLint
+      - name: Run ESLint (error)
+        working-directory: apps/drec-api
+        run: pnpm run lint:error
+
+      - name: Run ESLint (all)
         working-directory: apps/drec-api
         run: pnpm run lint
         continue-on-error: true
@@ -72,7 +76,7 @@ jobs:
       - name: Install tooling
         run: |
           npm i -g @microsoft/rush
-          npm i -g pnpm@6
+          npm i -g pnpm@7
 
       - name: Install drec-origin
         run: |

diff --git a/.github/workflows/deploy-gh-pages.yaml b/.github/workflows/deploy-gh-pages.yaml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Pages
         uses: actions/configure-pages@v2
@@ -36,23 +36,17 @@ jobs:
           node-version: lts/gallium
 
       - name: Install tooling
-        run: |
-          npm i -g @microsoft/rush
-          npm i -g pnpm@6
+        working-directory: docs
+        run: npm install
 
-      - name: Install drec-api
-        working-directory: apps/drec-api
-        run: |
-          rush install
-
-      - name: Build docs with compodoc
-        working-directory: apps/drec-api
-        run: pnpm run compodoc
+      - name: Build docs with VitePress
+        working-directory: docs
+        run: npm run docs:build
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:
-          path: apps/drec-api/documentation/
+          path: docs/.vitepress/dist/
 
   # Deployment job
   deploy:

diff --git a/.gitignore b/.gitignore
@@ -90,3 +90,5 @@ apps/drec-api/bin/drec-api
 
 # Docs build output
 apps/drec-api/documentation
+docs/.vitepress/cache
+docs/.vitepress/dist
diff --git a/apps/drec-api/.eslintrc.js b/apps/drec-api/.eslintrc.js
@@ -7,9 +7,8 @@ module.exports = {
   },
   plugins: ['@typescript-eslint/eslint-plugin'],
   extends: [
-    // Temporarily disable `eslint:recommended` until other lint issues have been fixed
-    // 'eslint:recommended',
-    // 'plugin:@typescript-eslint/eslint-recommended',
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
     'plugin:@typescript-eslint/recommended',
     'prettier',
     'prettier/@typescript-eslint',

diff --git a/apps/drec-api/Dockerfile b/apps/drec-api/Dockerfile
@@ -7,7 +7,7 @@ RUN npm cache clean --force
 COPY . .
 
 RUN npm i -g @microsoft/rush
-RUN npm i -g pnpm@6
+RUN npm i -g pnpm@7
 
 WORKDIR /dist/src/app/apps/drec-api
 

diff --git a/apps/drec-api/migrations/1658924656241-IntermideatryTableFields.ts b/apps/drec-api/migrations/1658924656241-IntermideatryTableFields.ts
@@ -21,5 +21,7 @@ export class IntermideatryTableFields1658924656241
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS aggregate_meterread`);
+  }
 }
diff --git a/apps/drec-api/migrations/1659507181646-DeviceMreterReadTypeField.ts b/apps/drec-api/migrations/1659507181646-DeviceMreterReadTypeField.ts
@@ -10,5 +10,7 @@ export class DeviceMreterReadTypeField1659507181646
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "device" DROP COLUMN "meterReadtype"`);
+  }
 }
diff --git a/apps/drec-api/migrations/1661178024560-DeviceGroupIssueCertificate.ts b/apps/drec-api/migrations/1661178024560-DeviceGroupIssueCertificate.ts
@@ -21,5 +21,9 @@ export class DeviceGroupIssueCertificate1661178024560
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP TABLE IF EXISTS public.next_issuance_date_log_for_device_group`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1661776597766-DeviceGroupNewFieldsForBuyerReservation.ts b/apps/drec-api/migrations/1661776597766-DeviceGroupNewFieldsForBuyerReservation.ts
@@ -19,5 +19,17 @@ export class DeviceGroupNewFieldsForBuyerReservation1661776597766
         `);
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "device_group" 
+      DROP COLUMN IF EXISTS "frequency",
+      DROP COLUMN IF EXISTS "reservationStartDate",
+      DROP COLUMN IF EXISTS "reservationEndDate",
+      DROP COLUMN IF EXISTS "targetVolumeInMegaWattHour",
+      DROP COLUMN IF EXISTS "targetVolumeCertificateGenerationRequestedInMegaWattHour",
+      DROP COLUMN IF EXISTS "targetVolumeCertificateGenerationSucceededInMegaWattHour",
+      DROP COLUMN IF EXISTS "targetVolumeCertificateGenerationFailedInMegaWattHour",
+      DROP COLUMN IF EXISTS "authorityToExceed",
+      DROP COLUMN IF EXISTS "leftoverReadsByCountryCode"
+    `);
+  }
 }
diff --git a/apps/drec-api/migrations/1662610170745-CheckcretificatelogforDeviceField.ts b/apps/drec-api/migrations/1662610170745-CheckcretificatelogforDeviceField.ts
@@ -23,5 +23,9 @@ export class CheckcretificatelogforDeviceField1662610170745
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP TABLE IF EXISTS public.check_certificate_issue_date_log_for_device`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1663162320749-CheckcretificatelogforDeviceGroupField.ts b/apps/drec-api/migrations/1663162320749-CheckcretificatelogforDeviceGroupField.ts
@@ -24,5 +24,9 @@ export class CheckcretificatelogforDeviceGroupField1663162320749
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP TABLE IF EXISTS public.check_certificate_issue_date_log_for_device_group`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1663219743369-DeviceGroupNewIdField.ts b/apps/drec-api/migrations/1663219743369-DeviceGroupNewIdField.ts
@@ -10,5 +10,12 @@ export class DeviceGroupNewIdField1663219743369 implements MigrationInterface {
         `);
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "device_group" DROP COLUMN "devicegroup_uid"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "check_certificate_issue_date_log_for_device_group" DROP COLUMN "countryCode"`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1663329270791-Sdgbenefit.ts b/apps/drec-api/migrations/1663329270791-Sdgbenefit.ts
@@ -18,5 +18,7 @@ export class Sdgbenefit1663329270791 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS public.sdgbenefit`);
+  }
 }
diff --git a/apps/drec-api/migrations/1665143885251-AddNewFieldDeviceLog.ts b/apps/drec-api/migrations/1665143885251-AddNewFieldDeviceLog.ts
@@ -7,5 +7,9 @@ export class AddNewFieldDeviceLog1665143885251 implements MigrationInterface {
         ADD "groupId" integer`);
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "check_certificate_issue_date_log_for_device" DROP COLUMN "groupId"`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1665490980305-HistoryIntermideateFirlds.ts b/apps/drec-api/migrations/1665490980305-HistoryIntermideateFirlds.ts
@@ -30,5 +30,12 @@ export class HistoryIntermideateFirlds1665490980305
           ADD "type" character varying`);
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP TABLE IF EXISTS public.history_intermediate_meteread`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "device_group" DROP COLUMN IF EXISTS "type"`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1665639446819-History_next_issuance_log.ts b/apps/drec-api/migrations/1665639446819-History_next_issuance_log.ts
@@ -20,5 +20,9 @@ export class HistoryNextIssuanceLog1665639446819 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP TABLE IF EXISTS public.history_next_issuance_log`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1669270905713-delta_firstread.ts b/apps/drec-api/migrations/1669270905713-delta_firstread.ts
@@ -18,5 +18,7 @@ export class deltaFirstread1669270905713 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS public.delta_firstread`);
+  }
 }
diff --git a/apps/drec-api/migrations/1669278431805-delta_firstread.ts b/apps/drec-api/migrations/1669278431805-delta_firstread.ts
@@ -18,5 +18,7 @@ export class deltaFirstread1669278431805 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS public.delta_firstread`);
+  }
 }
diff --git a/apps/drec-api/migrations/1669979907621-Deviceexternalidcitext.ts b/apps/drec-api/migrations/1669979907621-Deviceexternalidcitext.ts
@@ -9,5 +9,10 @@ export class Deviceexternalidcitext1669979907621 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "device" ALTER COLUMN "externalId" TYPE varchar`,
+    );
+    await queryRunner.query(`DROP EXTENSION IF EXISTS citext`);
+  }
 }
diff --git a/apps/drec-api/migrations/1671692507995-devicesdgbdatatypechange.ts b/apps/drec-api/migrations/1671692507995-devicesdgbdatatypechange.ts
@@ -10,5 +10,9 @@ export class devicesdgbdatatypechange1671692507995
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "device" ALTER COLUMN "SDGBenefits" TYPE jsonb`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1673435097445-devicesIdscolumn.ts b/apps/drec-api/migrations/1673435097445-devicesIdscolumn.ts
@@ -8,5 +8,9 @@ export class devicesIdscolumn1673435097445 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "device_group" DROP COLUMN "deviceIds"`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1676611071793-add_developer_externalId.ts b/apps/drec-api/migrations/1676611071793-add_developer_externalId.ts
@@ -9,5 +9,10 @@ export class addDeveloperExternalId1676611071793 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "device" DROP COLUMN IF EXISTS "developerExternalId"`,
+    );
+    await queryRunner.query(`DROP EXTENSION IF EXISTS citext`);
+  }
 }
diff --git a/apps/drec-api/migrations/1678690129095-certificateTransactionUID.ts b/apps/drec-api/migrations/1678690129095-certificateTransactionUID.ts
@@ -14,5 +14,13 @@ export class certificateTransactionUID1678690129095
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "check_certificate_issue_date_log_for_device_group" DROP COLUMN IF EXISTS "certificateTransactionUID"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "check_certificate_issue_date_log_for_device" DROP COLUMN IF EXISTS "certificateTransactionUID"`,
+    );
+    await queryRunner.query(`DROP EXTENSION IF EXISTS citext`);
+  }
 }
diff --git a/apps/drec-api/migrations/1681791249032-Secretkeyremove.ts b/apps/drec-api/migrations/1681791249032-Secretkeyremove.ts
@@ -8,5 +8,9 @@ export class Secretkeyremove1681791249032 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "organization" ADD "secretKey" character varying`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1681978992039-clean-up-dtofield.ts b/apps/drec-api/migrations/1681978992039-clean-up-dtofield.ts
@@ -18,5 +18,19 @@ export class cleanUpDtofield1681978992039 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "device" 
+        ADD COLUMN "status" character varying,
+        ADD COLUMN "data" jsonb,
+        ADD COLUMN "integrator" character varying`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "device_group" 
+        ADD COLUMN "standardCompliance" jsonb,
+        ADD COLUMN "installationConfigurations" jsonb,
+        ADD COLUMN "sectors" jsonb,
+        ADD COLUMN "labels" jsonb`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1682658608261-updateTable.ts b/apps/drec-api/migrations/1682658608261-updateTable.ts
@@ -11,5 +11,14 @@ export class updateTable1682658608261 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "developer_specific_manageGroupDevices_notFor_buyerReservation" (
+        -- Define table columns here if needed
+      )`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE device_group DROP COLUMN IF EXISTS "deviceIdsInt"`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1682659987637-updateColumnvaluinNew.ts b/apps/drec-api/migrations/1682659987637-updateColumnvaluinNew.ts
@@ -14,5 +14,9 @@ export class updateColumnvaluinNew1682659987637 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Since updating column values in a down migration can lead to data loss or inconsistency,
+    // and reverting the update operation is complex and risky, leaving the down method empty.
+  }
 }
diff --git a/apps/drec-api/migrations/1683004757319-addReservationActiveCloumn.ts b/apps/drec-api/migrations/1683004757319-addReservationActiveCloumn.ts
@@ -10,5 +10,9 @@ export class addReservationActiveCloumn1683004757319
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "device_group" DROP COLUMN IF EXISTS "reservationActive"`,
+    );
+  }
 }
diff --git a/apps/drec-api/migrations/1683267973604-addDeviceTimezone.ts b/apps/drec-api/migrations/1683267973604-addDeviceTimezone.ts
@@ -11,5 +11,12 @@ export class addDeviceTimezone1683267973604 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "device" DROP COLUMN IF EXISTS "timezone"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "device" DROP COLUMN IF EXISTS "version"`,
+    );
+  }
 }