rez_core 2.1.55 → 2.1.57

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. package/dist/module/listmaster/controller/list-master.controller.d.ts +6 -1
  2. package/dist/module/listmaster/controller/list-master.controller.js +20 -4
  3. package/dist/module/listmaster/controller/list-master.controller.js.map +1 -1
  4. package/dist/module/listmaster/repository/list-master-items.repository.d.ts +2 -2
  5. package/dist/module/listmaster/repository/list-master-items.repository.js +14 -7
  6. package/dist/module/listmaster/repository/list-master-items.repository.js.map +1 -1
  7. package/dist/module/listmaster/repository/list-master.repository.d.ts +2 -1
  8. package/dist/module/listmaster/repository/list-master.repository.js +12 -2
  9. package/dist/module/listmaster/repository/list-master.repository.js.map +1 -1
  10. package/dist/module/listmaster/service/list-master-item.service.d.ts +1 -1
  11. package/dist/module/listmaster/service/list-master-item.service.js +39 -17
  12. package/dist/module/listmaster/service/list-master-item.service.js.map +1 -1
  13. package/dist/module/listmaster/service/list-master.service.d.ts +1 -0
  14. package/dist/module/listmaster/service/list-master.service.js +11 -4
  15. package/dist/module/listmaster/service/list-master.service.js.map +1 -1
  16. package/dist/tsconfig.build.tsbuildinfo +1 -1
  17. package/dist/utils/service/codeGenerator.service.d.ts +3 -0
  18. package/dist/utils/service/codeGenerator.service.js +19 -0
  19. package/dist/utils/service/codeGenerator.service.js.map +1 -0
  20. package/package.json +1 -1
  21. package/src/module/listmaster/controller/list-master.controller.ts +27 -3
  22. package/src/module/listmaster/repository/list-master-items.repository.ts +26 -7
  23. package/src/module/listmaster/repository/list-master.repository.ts +19 -2
  24. package/src/module/listmaster/service/list-master-item.service.ts +55 -24
  25. package/src/module/listmaster/service/list-master.service.ts +15 -10
  26. package/src/utils/service/codeGenerator.service.ts +22 -0
@@ -8,7 +8,12 @@ export declare class ListMasterController {
8
8
  label: any;
9
9
  value: any;
10
10
  }[]>;
11
- getListMasterItems(type: string): Promise<import("../entity/list-master-items.entity").ListMasterItems[]>;
11
+ getListMasterItems(type: string, req: Request & {
12
+ user: any;
13
+ }, search?: string): Promise<import("../entity/list-master-items.entity").ListMasterItems[]>;
14
+ getAllListMasters(req: Request & {
15
+ user: any;
16
+ }, search?: string): Promise<any[]>;
12
17
  upsertListMasterItem(type: string, item: any, req: Request & {
13
18
  user: any;
14
19
  }): Promise<any>;
@@ -30,9 +30,13 @@ let ListMasterController = class ListMasterController {
30
30
  const loggedInUser = req.user.userData;
31
31
  return await this.service.getDropdownOptions(type, params, inactiveIdsArray, loggedInUser);
32
32
  }
33
- async getListMasterItems(type) {
34
- console.log('Fetching list master items for type:', type);
35
- return await this.listMasterItemService.getListMasterItemsByType(type);
33
+ async getListMasterItems(type, req, search) {
34
+ const loggedInUser = req.user.userData;
35
+ return await this.listMasterItemService.getListMasterItemsByType(type, loggedInUser.organization_id, search);
36
+ }
37
+ async getAllListMasters(req, search) {
38
+ const loggedInUser = req.user.userData;
39
+ return await this.service.getAllListMasterByOrganization(loggedInUser.organization_id, search);
36
40
  }
37
41
  async upsertListMasterItem(type, item, req) {
38
42
  let loggedInUser = req.user.userData;
@@ -59,10 +63,22 @@ __decorate([
59
63
  (0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),
60
64
  (0, common_1.HttpCode)(common_1.HttpStatus.OK),
61
65
  __param(0, (0, common_1.Param)('type')),
66
+ __param(1, (0, common_1.Req)()),
67
+ __param(2, (0, common_1.Query)('search')),
62
68
  __metadata("design:type", Function),
63
- __metadata("design:paramtypes", [String]),
69
+ __metadata("design:paramtypes", [String, Object, String]),
64
70
  __metadata("design:returntype", Promise)
65
71
  ], ListMasterController.prototype, "getListMasterItems", null);
72
+ __decorate([
73
+ (0, common_1.Get)(''),
74
+ (0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),
75
+ (0, common_1.HttpCode)(common_1.HttpStatus.OK),
76
+ __param(0, (0, common_1.Req)()),
77
+ __param(1, (0, common_1.Query)('search')),
78
+ __metadata("design:type", Function),
79
+ __metadata("design:paramtypes", [Object, String]),
80
+ __metadata("design:returntype", Promise)
81
+ ], ListMasterController.prototype, "getAllListMasters", null);
66
82
  __decorate([
67
83
  (0, common_1.Post)('/upsertListMasterItem/:type'),
68
84
  (0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),
@@ -1 +1 @@
1
- {"version":3,"file":"list-master.controller.js","sourceRoot":"","sources":["../../../../src/module/listmaster/controller/list-master.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAcwB;AACxB,wEAAmE;AACnE,2DAAgE;AAChE,kFAA4E;AAGrE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAEmB,OAA0B,EAE1B,qBAA4C;QAF5C,YAAO,GAAP,OAAO,CAAmB;QAE1B,0BAAqB,GAArB,qBAAqB,CAAuB;IAC5D,CAAC;IAKE,AAAN,KAAK,CAAC,eAAe,CACJ,IAAY,EAClB,WAAmC,EACjC,GAAG;QAEd,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,EAAE,GAAG,WAAW,CAAC;QAE/C,MAAM,gBAAgB,GAAG,WAAW;YAClC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACtD,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAEvC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAC1C,IAAI,EACJ,MAAM,EACN,gBAAgB,EAChB,YAAY,CACb,CAAC;IACJ,CAAC;IAKK,AAAN,KAAK,CAAC,kBAAkB,CAAgB,IAAY;QAClD,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,IAAI,CAAC,CAAC;QAC1D,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;IACzE,CAAC;IAIK,AAAN,KAAK,CAAC,oBAAoB,CACT,IAAY,EACnB,IAAS,EACV,GAA4B;QAEnC,IAAI,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAErC,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,CAC1D,IAAI,EACJ,IAAI,CAAC,KAAK,EACV,YAAY,CACb,CAAC;IACJ,CAAC;IAKK,AAAN,KAAK,CAAC,oBAAoB,CACT,IAAY,EACZ,IAAY;QAE3B,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;CACF,CAAA;AAjEY,oDAAoB;AAWzB;IAHL,IAAA,aAAI,EAAC,wBAAwB,CAAC;IAC9B,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAErB,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,cAAK,GAAE,CAAA;IACP,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;2DAgBX;AAKK;IAHL,IAAA,YAAG,EAAC,2BAA2B,CAAC;IAChC,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACE,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;;;;8DAGtC;AAIK;IAHL,IAAA,aAAI,EAAC,6BAA6B,CAAC;IACnC,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAErB,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,aAAI,GAAE,CAAA;IACN,WAAA,IAAA,YAAG,GAAE,CAAA;;;;gEASP;AAKK;IAHL,IAAA,eAAM,EAAC,mCAAmC,CAAC;IAC3C,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAErB,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;;;;gEAGf;+BAhEU,oBAAoB;IADhC,IAAA,mBAAU,EAAC,aAAa,CAAC;IAGrB,WAAA,IAAA,eAAM,EAAC,mBAAmB,CAAC,CAAA;IAE3B,WAAA,IAAA,eAAM,EAAC,uBAAuB,CAAC,CAAA;qCADN,uCAAiB;QAEH,gDAAqB;GALpD,oBAAoB,CAiEhC"}
1
+ {"version":3,"file":"list-master.controller.js","sourceRoot":"","sources":["../../../../src/module/listmaster/controller/list-master.controller.ts"],"names":[],"mappings":"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"}
@@ -9,7 +9,7 @@ export declare class ListMasterItemsRepository {
9
9
  label: string;
10
10
  value: string;
11
11
  }[]>;
12
- findAllItemsByListType(type: string, sortBy: string): Promise<ListMasterItems[]>;
13
- findOneByCodeAndType(code: string, type: string): Promise<ListMasterItems | null>;
12
+ findAllItemsByListType(type: string, sortBy: string, organizationId: number, search?: string): Promise<ListMasterItems[]>;
13
+ findOneByCondition(condition: Partial<ListMasterItems>): Promise<ListMasterItems | null>;
14
14
  delete(item: Partial<ListMasterItems>): Promise<import("typeorm").DeleteResult>;
15
15
  }
@@ -36,15 +36,22 @@ let ListMasterItemsRepository = class ListMasterItemsRepository {
36
36
  });
37
37
  return items.map((i) => ({ label: i.name, value: i.value }));
38
38
  }
39
- async findAllItemsByListType(type, sortBy) {
40
- return this.repo.find({
41
- where: { listtype: type },
42
- order: { sortindex: sortBy === 'asc' ? 'ASC' : 'DESC' },
43
- });
39
+ async findAllItemsByListType(type, sortBy, organizationId, search) {
40
+ const qb = this.repo
41
+ .createQueryBuilder('item')
42
+ .where('item.listtype = :type', { type })
43
+ .andWhere('item.organization_id = :organizationId', { organizationId });
44
+ if (search?.trim()) {
45
+ qb.andWhere('(LOWER(item.name) LIKE :search OR LOWER(item.code) LIKE :search)', { search: `%${search.toLowerCase()}%` });
46
+ }
47
+ qb.orderBy('item.sortindex', sortBy === 'asc' ? 'ASC' : 'DESC');
48
+ return await qb.getMany();
44
49
  }
45
- async findOneByCodeAndType(code, type) {
50
+ async findOneByCondition(condition) {
46
51
  return this.repo.findOne({
47
- where: { code, listtype: type },
52
+ where: {
53
+ ...condition,
54
+ },
48
55
  });
49
56
  }
50
57
  async delete(item) {
@@ -1 +1 @@
1
- {"version":3,"file":"list-master-items.repository.js","sourceRoot":"","sources":["../../../../src/module/listmaster/repository/list-master-items.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAqC;AACrC,iFAAqE;AAG9D,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IACpC,YAEU,IAAiC;QAAjC,SAAI,GAAJ,IAAI,CAA6B;IACxC,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,IAA8B;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,IAA8B;QACrD,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAY;QAChC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACjC,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE;YAC3C,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;SAC5B,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAAY,EAAE,MAAc;QACvD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACpB,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;YACzB,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE;SACxD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAY,EAAE,IAAY;QACnD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACvB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;SAChC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAA8B;QACzC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CACF,CAAA;AAxCY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,0CAAe,CAAC,CAAA;qCACpB,oBAAU;GAHf,yBAAyB,CAwCrC"}
1
+ {"version":3,"file":"list-master-items.repository.js","sourceRoot":"","sources":["../../../../src/module/listmaster/repository/list-master-items.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAqC;AACrC,iFAAqE;AAG9D,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IACpC,YAEU,IAAiC;QAAjC,SAAI,GAAJ,IAAI,CAA6B;IACxC,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,IAA8B;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,IAA8B;QACrD,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAY;QAChC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACjC,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE;YAC3C,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;SAC5B,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,IAAY,EACZ,MAAc,EACd,cAAsB,EACtB,MAAe;QAEf,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI;aACjB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,KAAK,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,CAAC;aACxC,QAAQ,CAAC,wCAAwC,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QAE1E,IAAI,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;YACnB,EAAE,CAAC,QAAQ,CACT,kEAAkE,EAClE,EAAE,MAAM,EAAE,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,CACxC,CAAC;QACJ,CAAC;QAED,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAEhE,OAAO,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;IAC5B,CAAC;IAGD,KAAK,CAAC,kBAAkB,CAAC,SAAmC;QAC1D,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACvB,KAAK,EAAE;gBACL,GAAG,SAAS;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAA8B;QACzC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CACF,CAAA;AA3DY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,0CAAe,CAAC,CAAA;qCACpB,oBAAU;GAHf,yBAAyB,CA2DrC"}
@@ -4,5 +4,6 @@ export declare class ListMasterRepository {
4
4
  private readonly repo;
5
5
  constructor(repo: Repository<ListMasterData>);
6
6
  findByType(type: string): Promise<ListMasterData | null>;
7
- findByName(name: string): Promise<ListMasterData | null>;
7
+ findOneByCondition(condition: Partial<ListMasterData>): Promise<ListMasterData | null>;
8
+ findAllItems(organizationId: number, search?: string): Promise<ListMasterData[]>;
8
9
  }
@@ -24,8 +24,18 @@ let ListMasterRepository = class ListMasterRepository {
24
24
  findByType(type) {
25
25
  return this.repo.findOne({ where: { type } });
26
26
  }
27
- findByName(name) {
28
- return this.repo.findOne({ where: { name } });
27
+ async findOneByCondition(condition) {
28
+ return await this.repo.findOne({ where: condition });
29
+ }
30
+ async findAllItems(organizationId, search) {
31
+ const qb = this.repo
32
+ .createQueryBuilder('item')
33
+ .where('item.source = :source', { source: 'master' })
34
+ .andWhere('item.organization_id = :organizationId', { organizationId });
35
+ if (search?.trim()) {
36
+ qb.andWhere('(LOWER(item.name) LIKE :search OR LOWER(item.code) LIKE :search)', { search: `%${search.toLowerCase()}%` });
37
+ }
38
+ return await qb.getMany();
29
39
  }
30
40
  };
31
41
  exports.ListMasterRepository = ListMasterRepository;
@@ -1 +1 @@
1
- {"version":3,"file":"list-master.repository.js","sourceRoot":"","sources":["../../../../src/module/listmaster/repository/list-master.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qEAA8D;AAC9D,qCAAqC;AACrC,6CAAmD;AAG5C,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAEmB,IAAgC;QAAhC,SAAI,GAAJ,IAAI,CAA4B;IAChD,CAAC;IAEJ,UAAU,CAAC,IAAY;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,UAAU,CAAC,IAAY;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAChD,CAAC;CACF,CAAA;AAbY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,mCAAc,CAAC,CAAA;qCACV,oBAAU;GAHxB,oBAAoB,CAahC"}
1
+ {"version":3,"file":"list-master.repository.js","sourceRoot":"","sources":["../../../../src/module/listmaster/repository/list-master.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qEAA8D;AAC9D,qCAAqC;AACrC,6CAAmD;AAG5C,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAEmB,IAAgC;QAAhC,SAAI,GAAJ,IAAI,CAA4B;IAChD,CAAC;IAEJ,UAAU,CAAC,IAAY;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAChD,CAAC;IAGD,KAAK,CAAC,kBAAkB,CAAC,SAAkC;QACzD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,cAAsB,EAAE,MAAe;QACxD,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI;aACjB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;aACpD,QAAQ,CAAC,wCAAwC,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QAE1E,IAAI,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;YACnB,EAAE,CAAC,QAAQ,CACT,kEAAkE,EAClE,EAAE,MAAM,EAAE,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,CACxC,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;IAC5B,CAAC;CACF,CAAA;AA9BY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,mCAAc,CAAC,CAAA;qCACV,oBAAU;GAHxB,oBAAoB,CA8BhC"}
@@ -6,7 +6,7 @@ export declare class ListMasterItemService {
6
6
  private readonly listMasterRepo;
7
7
  private readonly entityServiceImpl;
8
8
  constructor(listItemsRepo: ListMasterItemsRepository, listMasterRepo: ListMasterItemsRepository, entityServiceImpl: EntityServiceImpl);
9
- getListMasterItemsByType(listType: string): Promise<import("../entity/list-master-items.entity").ListMasterItems[]>;
9
+ getListMasterItemsByType(listType: string, organization_id: number, search?: string): Promise<import("../entity/list-master-items.entity").ListMasterItems[]>;
10
10
  createEntity(entityData: any, loggedInUser: UserData): Promise<any>;
11
11
  updateEntity(entityData: any, loggedInUser: UserData): Promise<any>;
12
12
  upsertListMasterItem(listType: string, items: any[], loggedInUser: any): Promise<any>;
@@ -16,32 +16,54 @@ exports.ListMasterItemService = void 0;
16
16
  const common_1 = require("@nestjs/common");
17
17
  const list_master_items_repository_1 = require("../repository/list-master-items.repository");
18
18
  const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
19
+ const codeGenerator_service_1 = require("../../../utils/service/codeGenerator.service");
19
20
  let ListMasterItemService = class ListMasterItemService {
20
21
  constructor(listItemsRepo, listMasterRepo, entityServiceImpl) {
21
22
  this.listItemsRepo = listItemsRepo;
22
23
  this.listMasterRepo = listMasterRepo;
23
24
  this.entityServiceImpl = entityServiceImpl;
24
25
  }
25
- async getListMasterItemsByType(listType) {
26
- return await this.listItemsRepo.findAllItemsByListType(listType, 'asc');
26
+ async getListMasterItemsByType(listType, organization_id, search) {
27
+ return this.listItemsRepo.findAllItemsByListType(listType, 'asc', organization_id, search);
27
28
  }
28
29
  async createEntity(entityData, loggedInUser) {
29
- return await this.entityServiceImpl.createEntity(entityData, loggedInUser);
30
+ try {
31
+ const generatedCode = codeGenerator_service_1.CodeGeneratorService.generateCode(entityData.name);
32
+ entityData.code = generatedCode;
33
+ entityData.organization_id = loggedInUser.organization_id;
34
+ entityData.value = generatedCode;
35
+ return await this.entityServiceImpl.createEntity(entityData, loggedInUser);
36
+ }
37
+ catch (error) {
38
+ throw error;
39
+ }
30
40
  }
31
41
  async updateEntity(entityData, loggedInUser) {
32
42
  return await this.entityServiceImpl.updateEntity(entityData, loggedInUser);
33
43
  }
34
44
  async upsertListMasterItem(listType, items, loggedInUser) {
35
- console.log('Upserting list master items for type:', listType);
45
+ const orgId = loggedInUser.organization_id;
36
46
  for (const item of items) {
37
- console.log('Processing item:', item);
47
+ const name = item.name?.trim();
48
+ const code = item.code?.trim();
49
+ if (!name)
50
+ continue;
38
51
  let existingItem;
39
- if (item.code) {
40
- console.log('Code provided:', item.code);
41
- existingItem = await this.listItemsRepo.findOneByCodeAndType(item.code, listType);
42
- console.log('Existing item found by code:', existingItem);
52
+ if (code) {
53
+ existingItem = await this.listItemsRepo.findOneByCondition({
54
+ code,
55
+ name,
56
+ listtype: listType,
57
+ organization_id: orgId,
58
+ });
59
+ }
60
+ if (!existingItem) {
61
+ existingItem = await this.listItemsRepo.findOneByCondition({
62
+ name,
63
+ listtype: listType,
64
+ organization_id: orgId,
65
+ });
43
66
  }
44
- console.log('Existing item found:', existingItem);
45
67
  if (existingItem) {
46
68
  await this.updateEntity({
47
69
  ...existingItem,
@@ -50,25 +72,25 @@ let ListMasterItemService = class ListMasterItemService {
50
72
  }, loggedInUser);
51
73
  }
52
74
  else {
53
- const createdItem = await this.createEntity({
75
+ await this.createEntity({
54
76
  ...item,
55
77
  listtype: listType,
78
+ name,
56
79
  value: '',
57
80
  }, loggedInUser);
58
- console.log('Created item, updating value to code:', createdItem.code);
59
- await this.listItemsRepo.update(createdItem.id, {
60
- value: createdItem.code,
61
- });
62
81
  }
63
82
  }
64
- const updatedItems = await this.listItemsRepo.findAllItemsByListType(listType, 'asc');
83
+ const updatedItems = await this.listItemsRepo.findAllItemsByListType(listType, 'asc', orgId);
65
84
  return {
66
85
  listType,
67
86
  items: updatedItems,
68
87
  };
69
88
  }
70
89
  async deleteListMasterItem(listType, code) {
71
- const item = await this.listItemsRepo.findOneByCodeAndType(code, listType);
90
+ const item = await this.listItemsRepo.findOneByCondition({
91
+ code,
92
+ listtype: listType,
93
+ });
72
94
  if (!item) {
73
95
  throw new common_1.NotFoundException(`Item with name ${code} not found in type ${listType}`);
74
96
  }
@@ -1 +1 @@
1
- {"version":3,"file":"list-master-item.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master-item.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"list-master-item.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master-item.service.ts"],"names":[],"mappings":"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"}
@@ -27,4 +27,5 @@ export declare class ListMasterService {
27
27
  createEntity(entityData: any, loggedInUser: UserData): Promise<any>;
28
28
  updateEntity(entityData: any, loggedInUser: UserData): Promise<any>;
29
29
  getEntityData(entity_type: string, id: number): Promise<any>;
30
+ getAllListMasterByOrganization(organizationId: number, search?: string): Promise<any[]>;
30
31
  }
@@ -163,8 +163,14 @@ let ListMasterService = class ListMasterService {
163
163
  entityData.is_factory = entityData.is_factory || 0;
164
164
  entityData.source = entityData.source || 'master';
165
165
  entityData.status = entityData.status || 'ACTIVE';
166
- entityData.type = entityData.type || 'LIST_MASTER';
167
- const existingListMaster = await this.listMasterRepo.findByName(entityData.name);
166
+ entityData.type = entityData.code;
167
+ entityData.sort_by = entityData.sort_by || 'asc';
168
+ entityData.organization_id = loggedInUser.organization_id;
169
+ const existingListMaster = await this.listMasterRepo.findOneByCondition({
170
+ name: entityData.name,
171
+ code: entityData.code,
172
+ organization_id: loggedInUser.organization_id,
173
+ });
168
174
  if (existingListMaster) {
169
175
  throw new common_1.BadRequestException('List master with the same name already exists');
170
176
  }
@@ -172,8 +178,6 @@ let ListMasterService = class ListMasterService {
172
178
  if (!createdListMaster) {
173
179
  throw new common_1.BadRequestException('Failed to create entity');
174
180
  }
175
- createdListMaster.type = createdListMaster.code;
176
- await this.entityServiceImpl.updateEntity(createdListMaster, loggedInUser);
177
181
  return createdListMaster;
178
182
  }
179
183
  async updateEntity(entityData, loggedInUser) {
@@ -182,6 +186,9 @@ let ListMasterService = class ListMasterService {
182
186
  async getEntityData(entity_type, id) {
183
187
  return await this.entityServiceImpl.getEntityData(entity_type, id);
184
188
  }
189
+ async getAllListMasterByOrganization(organizationId, search) {
190
+ return await this.listMasterRepo.findAllItems(organizationId, search);
191
+ }
185
192
  };
186
193
  exports.ListMasterService = ListMasterService;
187
194
  exports.ListMasterService = ListMasterService = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"list-master.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"list-master.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master.service.ts"],"names":[],"mappings":"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"}