rez_core 2.0.35 → 2.0.36

package/package.json

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

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

@@ -6,9 +6,19 @@ import { OrganizationController } from './controller/organization.controller';
 import { UserModule } from '../user/user.module';
 import { OrganizationAppMappingService } from './service/organization-app-mapping.service';
 import { OrganizationAppMapping } from './entity/organization-app-mapping.entity';
+import { BrandData } from './entity/brand.entity';
+import { SchoolData } from './entity/school.entity';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([OrganizationData , OrganizationAppMapping]), UserModule],
+  imports: [
+    TypeOrmModule.forFeature([
+      OrganizationData,
+      OrganizationAppMapping,
+      BrandData,
+      SchoolData,
+    ]),
+    UserModule,
+  ],
   controllers: [OrganizationController],
   providers: [OrganizationService, OrganizationAppMappingService],
   exports: [OrganizationService],

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

@@ -0,0 +1,5 @@
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Entity } from 'typeorm';
+
+@Entity({ name: 'cr_brand' })
+export class BrandData extends BaseEntity {}

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

@@ -0,0 +1,9 @@
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Entity } from 'typeorm';
+
+@Entity({ name: 'cr_school' })
+export class SchoolData extends BaseEntity {
+  brand_id: number;
+
+  brand_code: string;
+}

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

@@ -110,6 +110,7 @@ export class EntityController {
     @Req() req: Request & { user: any },
   ) {
     let loggedInUser = req.user.userData;
+    console.log(loggedInUser," loggedInUser");
     // let loggedInUser = await this.entityService.getEntityData(
     //   ENTITYTYPE_USER,
     //   requestedUser.userId,
@@ -120,14 +121,18 @@ export class EntityController {
       );
     }
 
+    console.log(entityType,"entityType");
     const entityMaster =
       await this.entityMasterService.getEntityData(entityType);
+    console.log(entityMaster, "entityMaster");
     const entityService =
       await this.reflectionHelper.getBean<EntityServiceImpl>(
         entityMaster.entity_service,
       );
+console.log(entityService, "entityService");
     if (entityService) {
       let existingEntity = await entityService.getEntityData(entityType, id);
+      console.log(existingEntity, "existingEntity");
       if (!existingEntity) {
       }
       // let mergeEntity = JsonUtil.merge(existingEntity, entityData);

package/src/module/meta/service/entity-service-impl.service.ts

@@ -117,10 +117,12 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     id: number,
   ): Promise<BaseEntity | null> {
     const entityData = await this.entityMasterService.getEntityData(entityType);
+    console.log(entityData, 'entityData in getEntityData');
 
     const repoService = this.reflectionHelper.getRepoService(
       entityData.entity_data_class,
     );
+    console.log(repoService, 'repoService in getEntityData');
     if (!repoService) {
       throw new Error(
         `Repository service not found for entityType: ${entityType}`,
@@ -172,7 +174,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     entityData.modified_date = new Date();
     if (loggedInUser) {
       entityData.modified_by = loggedInUser.id;
-      if (!entityData?.organization_id && entityData.entity_type !== 'ORG')
+      if (!entityData.organization_id && entityData.parent_type !== 'ORG')
         entityData.organization_id = loggedInUser.organization_id;
       if (!entityData.enterprise_id)
         entityData.enterprise_id = loggedInUser.enterprise_id;