rez_core 6.5.15 → 6.5.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "6.5.15",
+  "version": "6.5.16",
   "description": "",
   "author": "",
   "private": false,

package/src/app.module.ts

@@ -31,7 +31,6 @@ import { ExportModule } from './module/export/export.module';
 
 @Module({
   imports: [
-    EntityModule,
     DatabaseModule,
     EnterpriseModule,
     UtilsModule,
@@ -62,7 +61,8 @@ import { ExportModule } from './module/export/export.module';
     MicroserviceClientsModule,
     LinkedAttributesModule,
     EntityJSONModule,
-    ExportModule
+    ExportModule,
+    EntityModule,
   ],
 })
 export class AppModule { }

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

@@ -1,18 +1,17 @@
-import { forwardRef, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { UserModule } from '../user/user.module';
-import { OrganizationController } from './controller/organization.controller';
-import { OrganizationAppMapping } from './entity/organization-app-mapping.entity';
+import { OrganizationService } from './service/organization.service';
 import { OrganizationData } from './entity/organization.entity';
+import { OrganizationController } from './controller/organization.controller';
 import { OrganizationAppMappingService } from './service/organization-app-mapping.service';
-import { OrganizationService } from './service/organization.service';
+import { OrganizationAppMapping } from './entity/organization-app-mapping.entity';
+// import { BrandData } from './entity/brand.entity';
+// import { SchoolData } from './entity/school.entity';
+// import { BrandRepository } from './repository/brand.repository';
 import { UtilsModule } from 'src/utils/utils.module';
-import { EntityModule } from '../meta/entity.module';
 import { OrganizationRepository } from './repository/organization.repository';
 import { SchoolRepository } from './repository/school.repository';
-import { WorkflowAutomationModule } from '../workflow-automation/workflow-automation.module';
 import { EnterpriseService } from './service/enterprise.service';
-import { BrandService } from './service/brand.service';
 import { EnterpriseRepository } from './repository/enterprise.repository';
 import { EnterpriseData } from './entity/enterprise.entity';
 import { EnterpriseController } from './controller/enterprise.controller';
@@ -22,10 +21,9 @@ import { EnterpriseController } from './controller/enterprise.controller';
     TypeOrmModule.forFeature([
       OrganizationData,
       OrganizationAppMapping,
-      EnterpriseData
+      EnterpriseData,
     ]),
     UtilsModule,
-    EntityModule,
   ],
   controllers: [OrganizationController, EnterpriseController],
   providers: [
@@ -35,11 +33,8 @@ import { EnterpriseController } from './controller/enterprise.controller';
     OrganizationRepository,
     EnterpriseService,
     EnterpriseRepository,
-    {
-      provide: 'BrandService',
-      useClass: BrandService,
-    },
   ],
   exports: [OrganizationService, OrganizationRepository, EnterpriseService, EnterpriseRepository],
 })
-export class EnterpriseModule {}
+export class EnterpriseModule {
+}

package/src/module/enterprise/service/brand-profile.service.ts

@@ -0,0 +1,10 @@
+// import { Inject, Injectable } from '@nestjs/common';
+// import { firstValueFrom } from 'rxjs';
+// import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+//
+// @Injectable()
+// export class BrandProfileService extends EntityServiceImpl {
+//   constructor() {
+//     super();
+//   }
+// }

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

@@ -1,5 +1,75 @@
-import { Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-
-@Injectable()
-export class BrandService extends EntityServiceImpl {}
+// import { Injectable } from '@nestjs/common';
+// import { InjectRepository } from '@nestjs/typeorm';
+//
+// @Injectable()
+// export class BrandService {
+//   constructor(
+//     @InjectRepository(Brand)
+//   ) {
+//
+//   }
+//
+//   async getEntityData(
+//     entityType: string,
+//     id: number,
+//     loggedInUser,
+//   ): Promise<any> {
+//     const brandResponse = await super.getEntityData(
+//       entityType,
+//       id,
+//       loggedInUser,
+//     );
+//
+//     return brandResponse;
+//   }
+//
+//   async createEntity(body: any, userData): Promise<any> {
+//     const { entity_type, ...data } = body;
+//
+//     const brandData = await super.createEntity(
+//       {
+//         ...data,
+//
+//         entity_type: 'ORG',
+//         type: 'BRN',
+//         parent_id: userData.organization_id,
+//       },
+//       userData,
+//     );
+//
+//     // save brand profile
+//
+//     const brandProfile = await super.createEntity(
+//       {
+//         ...body,
+//         parent_id: brandData.id,
+//         organization_id: brandData.organization_id,
+//         entity_type: 'BRNP',
+//       },
+//       userData,
+//     );
+//
+//     return brandProfile;
+//   }
+//
+//   async updateEntity(body: any, userData): Promise<any> {
+//     // update brand table
+//     const { id, entity_type, organization_id, ...newBody } = body;
+//
+//     const brandProfile = await super.updateEntity(body, userData);
+//
+//     // update brand
+//     await super.updateEntity(
+//       {
+//         ...newBody,
+//         id: brandProfile.parent_id,
+//         parent_id: userData.organization_id,
+//         entity_type: 'ORG',
+//         type: 'BRN',
+//       },
+//       userData,
+//     );
+//
+//     return brandProfile;
+//   }
+// }

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

@@ -0,0 +1,5 @@
+// import { Injectable } from '@nestjs/common';
+// import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+//
+// @Injectable()
+// export class SchoolService extends EntityServiceImpl {}

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

@@ -77,12 +77,11 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
       AppMaster,
       EntityRelation,
       EntityRelationData,
-      EntityUpdateService
     ]),
     forwardRef(() => ListMasterModule),
     forwardRef(() => FilterModule),
     UtilsModule,
-    WorkflowAutomationModule,
+    forwardRef(() => WorkflowAutomationModule),
     
   ],
   providers: [
@@ -123,7 +122,6 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     ResolverService,
     EntityMasterRepository,
     EntityRelationRepository,
-    AppMasterRespository
   ],
   exports: [
     EntityMasterService,

package/src/module/workflow-automation/workflow-automation.module.ts

@@ -28,7 +28,7 @@ import { WorkflowScheduleModule } from '../workflow-schedule/workflow-schedule.m
       ListMasterData,
       ActionCategory
     ]),
-    FilterModule,
+    forwardRef(() => FilterModule),
     forwardRef(() => EntityModule),
     DiscoveryModule, // 👈 enables provider scanning
   ],