Merge pull request #211 from d-rec/DR-785

DR-785,worked on certificate issue,change in issuermeta data payload …
d-rec · May 10, 2024 · 0b556e6 · 0b556e6
2 parents b77eb39 + 9875c42
commit 0b556e6
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 237 deletions.
diff --git a/apps/drec-api/src/pods/certificate-log/certificate-log.service.ts b/apps/drec-api/src/pods/certificate-log/certificate-log.service.ts
@@ -203,8 +203,15 @@ export class CertificateLogService {
           ); //going back 1 second in start and going forward 1 second in end
 
           await Promise.all(
-            obj.deviceIds.map(async (deviceid: number) => {
-              const device = await this.deviceService.findOne(deviceid);
+            obj.deviceIds.map(async (deviceid) => {
+              let device: Device;
+              if (typeof deviceid === 'number') {
+                device = await this.deviceService.findOne(deviceid);
+              }
+              if (typeof deviceid === 'string') {
+                device = await this.deviceService.findReads(deviceid);
+              }
+
               const devicelog =
                 await this.getCheckCertificateIssueDateLogForDevice(
                   parseInt(groupid),
@@ -291,7 +298,14 @@ export class CertificateLogService {
 
           await Promise.all(
             obj.deviceIds.map(async (deviceid: number) => {
-              const device = await this.deviceService.findOne(deviceid);
+              let device: Device;
+              if (typeof deviceid === 'number') {
+                device = await this.deviceService.findOne(deviceid);
+              }
+              if (typeof deviceid === 'string') {
+                device = await this.deviceService.findReads(deviceid);
+              }
+
               const devicelog =
                 await this.getCheckCertificateIssueDateLogForDevice(
                   parseInt(groupid),

diff --git a/apps/drec-api/src/pods/device/device.service.ts b/apps/drec-api/src/pods/device/device.service.ts
@@ -461,11 +461,15 @@ export class DeviceService {
     return device;
   }
 
-  async findReads(meterId: string): Promise<DeviceDTO | null> {
+  async findReads(meterId: string): Promise<Device | null> {
     this.logger.verbose(`With in findReads`);
     const result = await this.repository.findOne({
       where: { externalId: meterId },
     });
+    result.timezone = await getLocalTimeZoneFromDevice(
+      result.createdAt,
+      result,
+    );
     delete result['organization'];
 
     return result ?? null;