Stage Push

apps/drec-api/migrations/1715146626520-OldIssuerLog.ts

@@ -21,7 +21,7 @@ export class OldIssuerLog1715146626520 implements MigrationInterface {
             "latestCommitment" text,
             "issuedPrivately" boolean NOT NULL,
             "blockchainNetId" integer,
-            "metadata" character varying NOT NULL,
+            "metadata" character varying NOT NULL
         )`);
   }
 

apps/drec-api/package.json

@@ -48,12 +48,12 @@
   "dependencies": {
     "@energyweb/energy-api-influxdb": "0.8.3",
     "@energyweb/issuer": "6.0.2-alpha.1646058469.0",
-    "@energyweb/issuer-api": "0.6.2-alpha.1646058469.0",
+    "@energyweb/issuer-api": "0.7.1",
     "@energyweb/origin-247-certificate": "4.1.5",
-    "@energyweb/origin-backend": "11.0.2-alpha.1634225870.0",
-    "@energyweb/origin-backend-core": "8.0.4-alpha.1634225870.0",
-    "@energyweb/origin-backend-utils": "1.6.2-alpha.1634225870.0",
-    "@energyweb/utils-general": "11.0.5-alpha.1634225870.0",
+    "@energyweb/origin-backend": "11.2.3",
+    "@energyweb/origin-backend-core": "8.2.3",
+    "@energyweb/origin-backend-utils": "1.8.2-alpha.1646058469.0",
+    "@energyweb/utils-general": "11.2.2-alpha.1646058469.0",
     "@ethersproject/bignumber": "5.3.0",
     "@influxdata/influxdb-client": "1.9.0",
     "@mapbox/timespace": "2.0.4",

apps/drec-api/src/pods/admin/admin.controller.ts

@@ -161,7 +161,11 @@ export class AdminController {
     type: CreateUserORGDTO,
     description: 'Returns a new created user',
   })
-  public async createUser(@Body() newUser: CreateUserORGDTO): Promise<UserDTO> {
+  public async createUser(
+    @Body() newUser: CreateUserORGDTO,
+    @UserDecorator() { api_user_id }: LoggedInUser,
+  ): Promise<UserDTO> {
+    newUser.api_user_id = api_user_id;
     return await this.userService.adminnewcreate(newUser);
   }
 
@@ -222,9 +226,9 @@ export class AdminController {
 
   @Put('/users/:id')
   @UseGuards(AuthGuard('jwt'), ActiveUserGuard, RolesGuard, PermissionGuard)
-  @Roles(Role.Admin)
+  @Roles(Role.Admin, Role.ApiUser)
   @Permission('Write')
-  @ACLModules('ADMIN_MANAGEMENT_CRUDL')
+  @ACLModules('ADMIN_APIUSER_ORGANIZATION_CRUDL')
   @ApiBody({ type: UpdateUserDTO })
   @ApiResponse({
     status: HttpStatus.OK,

apps/drec-api/src/pods/device-group/buyer-reservation.controller.ts

@@ -739,17 +739,15 @@ export class BuyerReservationController {
           });
         }
       } else {
-        if (orgId != organizationId) {
+        if (orgId != organizationId && role != Role.Admin) {
           this.logger.error(
             `The organizationId in query params should be same as user's organizationId`,
           );
           throw new BadRequestException({
             success: false,
             message: `The organizationId in query params should be same as user's organizationId`,
           });
-        }
-
-        if (role === Role.Admin) {
+        } else if (role === Role.Admin) {
           orgId = null;
         }
       }

apps/drec-api/src/pods/device/device.controller.ts

@@ -404,7 +404,12 @@ export class DeviceController {
   ): Promise<DeviceDTO | null> {
     this.logger.verbose(`With in getByExternalId`);
     let devicedata: Device;
-    if (loginUser.role === Role.ApiUser) {
+
+    if (loginUser.role === Role.ApiUser || loginUser.role === Role.Admin) {
+      if (loginUser.role === Role.Admin) {
+        loginUser.api_user_id = null;
+      }
+
       devicedata =
         await this.deviceService.findDeviceByDeveloperExternalIByApiUser(
           id,
@@ -633,12 +638,14 @@ export class DeviceController {
           user.organizationId = deviceToUpdate.organizationId;
         }
       } else {
-        if (user.organizationId != org.id) {
+        if (user.role != Role.Admin && user.organizationId != org.id) {
           this.logger.error(`Unauthorized`);
           throw new UnauthorizedException({
             success: false,
             message: 'Unauthorized',
           });
+        } else if (user.role === Role.Admin) {
+          user.organizationId = deviceToUpdate.organizationId;
         }
       }
     }

apps/drec-api/src/pods/reads/reads.controller.ts

@@ -1029,7 +1029,7 @@ export class ReadsController extends BaseReadsController {
         for (const key in ele) {
           if (key === 'starttimestamp' || key === 'endtimestamp') {
             if (ele[key]) {
-              let dateString = new Date(ele[key]).toISOString();
+              let dateString = ele[key].toString();
               const dateTimeRegex =
                 /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.{0,1}\d{0,3}$/;
               if (dateString.includes('.')) {
@@ -1160,11 +1160,11 @@ export class ReadsController extends BaseReadsController {
           datesContainingNullOrEmptyValues = true;
         }
         const startdateformate = isValidUTCDateFormat(
-          ele.starttimestamp.toString(),
+          new Date(ele.starttimestamp).toISOString(),
         );
 
         const enddateformate = isValidUTCDateFormat(
-          ele.endtimestamp.toString(),
+          new Date(ele.endtimestamp).toISOString(),
         );
 
         if (!startdateformate || !enddateformate) {
@@ -1326,7 +1326,7 @@ export class ReadsController extends BaseReadsController {
           datesContainingNullOrEmptyValues = true;
         }
         const enddateformate = isValidUTCDateFormat(
-          ele.endtimestamp.toISOString(),
+          new Date(ele.endtimestamp).toISOString(),
         );
 
         if (!enddateformate) {

apps/drec-api/src/pods/reads/reads.service.ts

@@ -51,7 +51,6 @@ import {
   IAggregateintermediate,
 } from '../../models';
 import { InjectRepository } from '@nestjs/typeorm';
-import { GetMarketplaceOrganizationHandler } from '@energyweb/origin-backend/dist/js/src/pods/organization/handlers/get-marketplace-organization.handler';
 import { ReadStatus } from '../../utils/enums';
 import { DeltaFirstRead } from './delta_firstread.entity';
 import { HistoryNextInssuanceStatus } from '../../utils/enums/history_next_issuance.enum';

apps/drec-api/src/pods/user/user.service.ts

@@ -166,6 +166,9 @@ export class UserService {
     inviteuser?: boolean,
   ): Promise<UserDTO> {
     await this.checkForExistingUser(data.email.toLowerCase());
+    const admin = await this.oauthClientCredentialsService.findOneByApiUserId(
+      data.api_user_id,
+    );
     let org_id;
     if (!inviteuser) {
       const orgdata = {
@@ -175,7 +178,7 @@ export class UserService {
         orgEmail: data.email,
         address: data.orgAddress,
       };
-
+      orgdata['api_user_id'] = admin.api_user_id;
       if (await this.organizationService.isNameAlreadyTaken(orgdata.name)) {
         throw new ConflictException({
           success: false,
@@ -212,6 +215,7 @@ export class UserService {
       role: role,
       roleId: roleId,
       organization: org_id ? { id: org_id } : {},
+      api_user_id: admin ? admin.api_user_id : null,
     });
     const { password, ...userData } = user;
     this.logger.debug(
@@ -508,6 +512,12 @@ export class UserService {
     id: number,
     data: UpdateUserDTO,
   ): Promise<ExtendedBaseEntity & IUser> {
+    data = new User({
+      firstName: data.firstName,
+      lastName: data.lastName,
+      email: data.email,
+      status: data.status,
+    });
     const validationErrors = await validate(data, {
       skipUndefinedProperties: true,
     });