rez_core 1.0.36 → 1.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "",
   "author": "",
   "private": false,
@@ -30,6 +30,7 @@
     "@nestjs/swagger": "^11.0.3",
     "@nestjs/typeorm": "^11.0.0",
     "250218_nodejs_core": "file:",
+    "aws-sdk": "^2.1692.0",
     "bcrypt": "^5.1.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
@@ -46,6 +47,7 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
     "typeorm": "^0.3.20",
+    "uuid": "^11.1.0",
     "winston": "^3.17.0",
     "xlsx": "^0.18.5"
   },

package/src/constant/global.constant.ts

@@ -17,3 +17,4 @@ export const secretKey: string = process.env.secret_key || '';
 // STATUS
 export const STATUS_ACTIVE = 'ACTIVE';
 export const STATUS_INACTIVE = 'INACTIVE';
+export const STATUS_PENDING = 'PENDING';

package/src/module/enterprise/controller/organization.controller.ts

@@ -1,16 +1,23 @@
-import { Controller, Get, Req, UseGuards } from '@nestjs/common';
+import { Controller, Get, Inject, Req, UseGuards } from '@nestjs/common';
 import { OrganizationService } from '../service/organization.service';
 import { Request } from 'express';
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+import { UserService } from 'src/module/user/service/user.service';
+import { ENTITYTYPE_USER } from '../../../constant/global.constant';
+
 
 @Controller('organization')
 export class OrganizationController {
-  constructor(private readonly orgService: OrganizationService) {}
+  constructor(private readonly orgService: OrganizationService,
+    @Inject('UserService') private readonly  userService: UserService
+  ) {}
 
   @UseGuards(JwtAuthGuard)
   @Get('dropdown')
-  async getOrganizationDropdown(@Req() req: Request) {
+  async getOrganizationDropdown(@Req() req: Request & { user: any }) {
+    const userId = req.user.userId;
+    const userData = await this.userService.getEntityData(ENTITYTYPE_USER, userId);
     // const enterpriseId = req.user['enterpriseId']; // or adapt based on your user structure
-    return this.orgService.findAll();
+    return this.orgService.findById(userData?.organization_id);
   }
 }

package/src/module/enterprise/enterprise.module.ts

@@ -3,9 +3,10 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { OrganizationService } from './service/organization.service';
 import { OrganizationData } from './entity/organization.entity';
 import { OrganizationController } from './controller/organization.controller';
+import { UserModule } from '../user/user.module';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([OrganizationData])],
+  imports: [TypeOrmModule.forFeature([OrganizationData]), UserModule],
   controllers:[OrganizationController],
   providers: [OrganizationService],
   exports: [OrganizationService],

package/src/module/enterprise/service/organization.service.ts

@@ -46,6 +46,10 @@ export class OrganizationService {
     return await repo.findOne({ where: { id } });
   }
 
+  async findById(id:number | undefined){
+    return await this.organizationRepository.find({ where: { id } });
+  }
+
   async update(
     id: number,
     organizationDto: Partial<OrganizationData>,

package/src/module/meta/controller/media.controller.ts

@@ -0,0 +1,45 @@
+import {
+  Body,
+  Controller,
+  HttpStatus,
+  Post,
+  Res,
+  UseGuards,
+} from '@nestjs/common';
+import { MediaDataService } from '../service/media-data.service';
+import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
+import { Response } from 'express';
+
+@Controller('media')
+@UseGuards(JwtAuthGuard)
+export class MediaController {
+  constructor(private readonly mediaDataService: MediaDataService) {}
+
+  @Post('initiate-upload')
+  async initiateUpload(
+    @Body()
+    body: {
+      file_name: string;
+      attribute_key: string;
+      mapped_entity_type?: string;
+      mapped_entity_id?: number;
+    },
+    @Res() res: Response,
+  ) {
+    let result = await this.mediaDataService.generateMediaUploadDetails(
+      body.file_name,
+      body.attribute_key,
+      body.mapped_entity_type,
+      body.mapped_entity_id,
+    );
+    if (result) {
+      res.status(HttpStatus.OK).json({
+        message: 'Upload initiated successfully',
+        success: true,
+        data: result,
+      });
+    } else {
+      throw new Error('Something went wrong!');
+    }
+  }
+}

package/src/module/meta/entity.module.ts

@@ -22,6 +22,7 @@ import { EntityListService } from './service/entity-list.service';
 import { MediaData } from './entity/media-data.entity';
 import { MediaDataService } from './service/media-data.service';
 import { MediaDataRepository } from './repository/media-data.repository';
+import { MediaController } from './controller/media.controller';
 
 @Module({
   imports: [
@@ -59,6 +60,6 @@ import { MediaDataRepository } from './repository/media-data.repository';
     EntityTableColumnService,
     MediaDataService,
   ],
-  controllers: [EntityController, MasterController],
+  controllers: [EntityController, MasterController, MediaController],
 })
 export class EntityModule {}

package/src/module/meta/service/media-data.service.ts

@@ -1,12 +1,76 @@
 import { Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from './entity-service-impl.service';
 import { MediaDataRepository } from '../repository/media-data.repository';
+import { ConfigService } from '@nestjs/config';
+import { S3 } from 'aws-sdk';
+import { MediaData } from '../entity/media-data.entity';
+import { STATUS_PENDING } from '../../../constant/global.constant';
+import { v4 as uuidv4 } from 'uuid';
 
 @Injectable()
 export class MediaDataService extends EntityServiceImpl {
-  constructor(private readonly mediaRepository: MediaDataRepository) {
+
+
+  constructor(
+    private readonly configService: ConfigService,
+    private readonly mediaRepository: MediaDataRepository,
+  ) {
     super();
   }
+  
+  s3AccessKeyID=this.configService.get('AWS.S3.AWS_ACCESS_KEY_ID')
+  s3AccessKeySecret=this.configService.get('AWS.S3.AWS_SECRET_KEY')
+  s3Region=this.configService.get('AWS.S3.AWS_REGION')
+  bucketName = this.configService.get<string>('AWS.S3.BUCKET_NAME');
+
+  s3 = new S3({
+    accessKeyId: this.s3AccessKeyID,
+    secretAccessKey: this.s3AccessKeySecret,
+    region: this.s3Region,
+    signatureVersion: 'v4',
+  });
+  
+  
+  async generateMediaUploadDetails(
+    fileName: string,
+    mappedAttributeKey: string,
+    mappedEntityType?: string,
+    mappedEntityId?: number,
+  ) {
+      
+    if (!fileName || !mappedAttributeKey) {
+      return null;
+    }
+    const ext = fileName.split('.').pop()?.toLowerCase() ?? '';
+
+    const id = uuidv4();
+    const s3Key = `uploads/${mappedAttributeKey}/${id}.${ext}`;
+    console.log(s3Key)
+
+    const uploadUrl = await this.s3.getSignedUrlPromise('putObject', {
+      Bucket: this.bucketName,
+      Key: s3Key,
+      Expires: 60 * 5, // URL valid for 5 mins
+      ContentType: this.getContentType(ext),
+    });
+
+    let mediaData = new MediaData();
+    mediaData.mapped_attribute_key = mappedAttributeKey;
+    mediaData.status = STATUS_PENDING;
+    if (mappedEntityType) {
+      mediaData.mapped_entity_type = mappedEntityType;
+    }
+    if (mappedEntityId) {
+      mediaData.mapped_entity_id = mappedEntityId;
+    }
+
+    let savedEntity = await super.createEntity(mediaData, null);
+
+    if (savedEntity) {
+      return { id: savedEntity.id, path: s3Key, uploadUrl };
+    }
+    return null;
+  }
 
   async findByAttributeKeyAndMappedEntityIdAndMappedEntityType(
     attributeKey: string,
@@ -41,4 +105,14 @@ export class MediaDataService extends EntityServiceImpl {
       mappedEntityType,
     );
   }
+
+  private getContentType(ext: string): string {
+    const map = {
+      pdf: 'application/pdf',
+      jpg: 'image/jpeg',
+      jpeg: 'image/jpeg',
+      png: 'image/png',
+    };
+    return map[ext] || 'application/octet-stream';
+  }
 }

package/src/module/user/service/user.service.ts

@@ -47,7 +47,7 @@ export class UserService extends EntityServiceImpl {
       throw new BadRequestException('User already exists');
     }
     userData.name =
-      userData.first_name + userData.last_name ? userData.last_name : '';
+      (userData.first_name ? userData.first_name : '') + (userData.last_name ? userData.last_name : '');
     let password;
     if (userData.password) {
       password = EncryptUtilService.encryptGCM(

package/src/resources/dev.properties.yaml

@@ -1,7 +1,7 @@
-DB_HOST: "localhost"
+DB_HOST: "13.234.25.234"
 DB_PORT: "3306"
 DB_USER: "root"
-DB_PASS: "root"
+DB_PASS: "Rezolut@123"
 DB_NAME: "core"
 MASTER_KEY: "0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh"
 MASTER_IV: "heuUQf5uPVtkotrFAOKUVw=="
@@ -12,4 +12,10 @@ CALLBACK_URL: "http://localhost:3000/auth/google/callback"
 OTP_EXPIRY: "10"
 OTP_LENGTH: "6"
 VERIFY_OTP: "false"
-DEFAULT_OTP: "123456"
+DEFAULT_OTP: "123456"
+AWS:
+  S3:
+    AWS_ACCESS_KEY_ID: "AKIAYYKIBDDSVJMYCJUV"
+    AWS_SECRET_KEY: "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"
+    AWS_REGION: "ap-south-1"
+    BUCKET_NAME: "testether"