rez_core 2.1.70 → 2.1.72
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.
- package/dist/module/enterprise/controller/organization.controller.js +2 -1
- package/dist/module/enterprise/controller/organization.controller.js.map +1 -1
- package/dist/module/enterprise/repository/school.repository.d.ts +1 -1
- package/dist/module/enterprise/repository/school.repository.js +6 -2
- package/dist/module/enterprise/repository/school.repository.js.map +1 -1
- package/dist/module/enterprise/service/organization.service.d.ts +1 -1
- package/dist/module/enterprise/service/organization.service.js +2 -2
- package/dist/module/enterprise/service/organization.service.js.map +1 -1
- package/dist/module/listmaster/service/list-master-item.service.js +53 -25
- package/dist/module/listmaster/service/list-master-item.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/enterprise/controller/organization.controller.ts +6 -1
- package/src/module/enterprise/repository/school.repository.ts +7 -2
- package/src/module/enterprise/service/organization.service.ts +10 -2
- package/src/module/listmaster/service/list-master-item.service.ts +71 -30
|
@@ -29,7 +29,8 @@ let OrganizationController = class OrganizationController {
|
|
|
29
29
|
async getOrganizationHierarchy(req) {
|
|
30
30
|
const userId = req.user.userData?.id;
|
|
31
31
|
const appcode = req.user.userData?.appcode;
|
|
32
|
-
|
|
32
|
+
const org_id = req.user.userData?.organization_id;
|
|
33
|
+
return await this.orgService.getOrganizationHierarchy(userId, appcode, org_id);
|
|
33
34
|
}
|
|
34
35
|
};
|
|
35
36
|
exports.OrganizationController = OrganizationController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organization.controller.js","sourceRoot":"","sources":["../../../../src/module/enterprise/controller/organization.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,0EAAsE;AAEtE,2DAAgE;AAChE,kEAAmE;AAI5D,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,UAA+B,EACR,WAAwB;QAD/C,eAAU,GAAV,UAAU,CAAqB;QACR,gBAAW,GAAX,WAAW,CAAa;IAC/D,CAAC;IAIE,AAAN,KAAK,CAAC,uBAAuB,CAAQ,GAA4B;QAC/D,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAGnC,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAC7D,CAAC;IAIK,AAAN,KAAK,CAAC,wBAAwB,CAAQ,GAA4B;QAChE,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"organization.controller.js","sourceRoot":"","sources":["../../../../src/module/enterprise/controller/organization.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,0EAAsE;AAEtE,2DAAgE;AAChE,kEAAmE;AAI5D,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,UAA+B,EACR,WAAwB;QAD/C,eAAU,GAAV,UAAU,CAAqB;QACR,gBAAW,GAAX,WAAW,CAAa;IAC/D,CAAC;IAIE,AAAN,KAAK,CAAC,uBAAuB,CAAQ,GAA4B;QAC/D,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAGnC,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAC7D,CAAC;IAIK,AAAN,KAAK,CAAC,wBAAwB,CAAQ,GAA4B;QAChE,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC3C,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC;QAElD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,wBAAwB,CACnD,MAAM,EACN,OAAO,EACP,MAAM,CACP,CAAC;IACJ,CAAC;CACF,CAAA;AA5BY,wDAAsB;AAQ3B;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,YAAG,EAAC,UAAU,CAAC;IACe,WAAA,IAAA,YAAG,GAAE,CAAA;;;;qEAKnC;AAIK;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,YAAG,EAAC,WAAW,CAAC;IACe,WAAA,IAAA,YAAG,GAAE,CAAA;;;;sEAUpC;iCA3BU,sBAAsB;IADlC,IAAA,mBAAU,EAAC,cAAc,CAAC;IAItB,WAAA,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;qCADO,0CAAmB;QACK,0BAAW;GAHvD,sBAAsB,CA4BlC"}
|
|
@@ -6,5 +6,5 @@ export declare class SchoolRepository {
|
|
|
6
6
|
constructor(schoolRepo: Repository<SchoolData>, dataSource: DataSource);
|
|
7
7
|
findAllByOrgId(brdId: number): Promise<SchoolData[]>;
|
|
8
8
|
findAllByBrandId(brdId: number): Promise<SchoolData[]>;
|
|
9
|
-
getUserContextDropdown(userId: number, appCode: string): Promise<any[]>;
|
|
9
|
+
getUserContextDropdown(userId: number, appCode: string, org_id: any): Promise<any[]>;
|
|
10
10
|
}
|
|
@@ -33,7 +33,7 @@ let SchoolRepository = class SchoolRepository {
|
|
|
33
33
|
where: { brand_id: brdId },
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
|
-
async getUserContextDropdown(userId, appCode) {
|
|
36
|
+
async getUserContextDropdown(userId, appCode, org_id) {
|
|
37
37
|
const userRoleRepo = this.dataSource.getRepository(user_role_mapping_entity_1.UserRoleMapping);
|
|
38
38
|
const hasOrgAccess = await userRoleRepo
|
|
39
39
|
.createQueryBuilder('urm')
|
|
@@ -41,6 +41,10 @@ let SchoolRepository = class SchoolRepository {
|
|
|
41
41
|
.andWhere('urm.appcode = :appCode', { appCode })
|
|
42
42
|
.andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
|
|
43
43
|
.getRawMany();
|
|
44
|
+
let currentORGLevel_id = hasOrgAccess[0]?.urm_level_id;
|
|
45
|
+
if (hasOrgAccess[0].urm_level_id == 1) {
|
|
46
|
+
currentORGLevel_id = org_id;
|
|
47
|
+
}
|
|
44
48
|
if (hasOrgAccess.length > 0) {
|
|
45
49
|
const schools = await this.dataSource
|
|
46
50
|
.createQueryBuilder()
|
|
@@ -60,7 +64,7 @@ let SchoolRepository = class SchoolRepository {
|
|
|
60
64
|
.from('cr_school', 'sch')
|
|
61
65
|
.innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
|
|
62
66
|
.innerJoin('cr_organization', 'org', 'br.organization_id = org.id')
|
|
63
|
-
.where('org.id = :orgId', { orgId:
|
|
67
|
+
.where('org.id = :orgId', { orgId: currentORGLevel_id })
|
|
64
68
|
.getRawMany();
|
|
65
69
|
const result = {};
|
|
66
70
|
for (const row of schools) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAiD;AACjD,2DAAqD;AACrD,yFAAkF;AAG3E,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YAEmB,UAAkC,EAClC,UAAsB;QADtB,eAAU,GAAV,UAAU,CAAwB;QAClC,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,cAAc,CAAC,KAAa;QAChC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAChC,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,KAAa;QAClC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAChC,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,MAAc,EAAE,OAAe;
|
|
1
|
+
{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,5 +17,5 @@ export declare class OrganizationService {
|
|
|
17
17
|
findById(id: number | undefined): Promise<OrganizationData[]>;
|
|
18
18
|
update(id: number, organizationDto: Partial<OrganizationData>, manager?: EntityManager): Promise<OrganizationData | null>;
|
|
19
19
|
remove(id: number, manager?: EntityManager): Promise<void>;
|
|
20
|
-
getOrganizationHierarchy(userId: number, appCode: string): Promise<any[]>;
|
|
20
|
+
getOrganizationHierarchy(userId: number, appCode: string, orgId: number): Promise<any[]>;
|
|
21
21
|
}
|
|
@@ -67,8 +67,8 @@ let OrganizationService = class OrganizationService {
|
|
|
67
67
|
: this.organizationRepository;
|
|
68
68
|
await repo.delete(id);
|
|
69
69
|
}
|
|
70
|
-
async getOrganizationHierarchy(userId, appCode) {
|
|
71
|
-
return await this.schoolRepository.getUserContextDropdown(userId, appCode);
|
|
70
|
+
async getOrganizationHierarchy(userId, appCode, orgId) {
|
|
71
|
+
return await this.schoolRepository.getUserContextDropdown(userId, appCode, orgId);
|
|
72
72
|
}
|
|
73
73
|
};
|
|
74
74
|
exports.OrganizationService = OrganizationService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organization.service.js","sourceRoot":"","sources":["../../../../src/module/enterprise/service/organization.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,6CAAmD;AACnD,qCAAoD;AACpD,uEAAiE;AACjE,0FAA6E;AAC7E,kEAAmE;AAEnE,qEAAiE;AACjE,uEAAmE;AAG5D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YAEmB,sBAAoD,EACpD,eAAgC,EAChC,gBAAkC,EAClC,KAAwB,EACD,WAAwB;QAJ/C,2BAAsB,GAAtB,sBAAsB,CAA8B;QACpD,oBAAe,GAAf,eAAe,CAAiB;QAChC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,UAAK,GAAL,KAAK,CAAmB;QACD,gBAAW,GAAX,WAAW,CAAa;IAC/D,CAAC;IAEJ,KAAK,CAAC,MAAM,CACV,eAA0C,EAC1C,OAAuB;QAEvB,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,eAAe,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACrD,eAAe,CAAC,MAAM,GAAG,QAAQ,CAAC;QAClC,eAAe,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;QAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAClD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAuB;QACnC,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,OAAO,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,OAAO,CACX,EAAU,EACV,OAAuB;QAEvB,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAsB;QACnC,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,MAAM,CACV,EAAU,EACV,eAA0C,EAC1C,OAAuB;QAEvB,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;QACvC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,OAAuB;QAC9C,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,wBAAwB,
|
|
1
|
+
{"version":3,"file":"organization.service.js","sourceRoot":"","sources":["../../../../src/module/enterprise/service/organization.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,6CAAmD;AACnD,qCAAoD;AACpD,uEAAiE;AACjE,0FAA6E;AAC7E,kEAAmE;AAEnE,qEAAiE;AACjE,uEAAmE;AAG5D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YAEmB,sBAAoD,EACpD,eAAgC,EAChC,gBAAkC,EAClC,KAAwB,EACD,WAAwB;QAJ/C,2BAAsB,GAAtB,sBAAsB,CAA8B;QACpD,oBAAe,GAAf,eAAe,CAAiB;QAChC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,UAAK,GAAL,KAAK,CAAmB;QACD,gBAAW,GAAX,WAAW,CAAa;IAC/D,CAAC;IAEJ,KAAK,CAAC,MAAM,CACV,eAA0C,EAC1C,OAAuB;QAEvB,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,eAAe,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACrD,eAAe,CAAC,MAAM,GAAG,QAAQ,CAAC;QAClC,eAAe,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;QAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAClD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAuB;QACnC,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,OAAO,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,OAAO,CACX,EAAU,EACV,OAAuB;QAEvB,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAsB;QACnC,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,MAAM,CACV,EAAU,EACV,eAA0C,EAC1C,OAAuB;QAEvB,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;QACvC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,OAAuB;QAC9C,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAgB,CAAC;YACzC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAEhC,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,MAAc,EACd,OAAe,EACf,KAAa;QAEb,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CACvD,MAAM,EACN,OAAO,EACP,KAAK,CACN,CAAC;IACJ,CAAC;CACF,CAAA;AAhFY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sCAAgB,CAAC,CAAA;IAKlC,WAAA,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;qCAJmB,oBAAU;QACjB,kCAAe;QACd,oCAAgB;QAC3B,0CAAiB;QACY,0BAAW;GAPvD,mBAAmB,CAgF/B"}
|
|
@@ -43,47 +43,75 @@ let ListMasterItemService = class ListMasterItemService {
|
|
|
43
43
|
}
|
|
44
44
|
async upsertListMasterItem(listType, items, loggedInUser) {
|
|
45
45
|
const orgId = loggedInUser.organization_id;
|
|
46
|
-
|
|
46
|
+
const errors = [];
|
|
47
|
+
for (let i = 0; i < items.length; i++) {
|
|
48
|
+
const item = items[i];
|
|
47
49
|
const name = item.name?.trim();
|
|
48
50
|
const code = item.code?.trim();
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
51
|
+
try {
|
|
52
|
+
if (!name) {
|
|
53
|
+
throw new common_1.BadRequestException(`name is missing at index ${i}`);
|
|
54
|
+
}
|
|
55
|
+
if (code) {
|
|
56
|
+
const existingItem = await this.listItemsRepo.findOneByCondition({
|
|
57
|
+
code,
|
|
58
|
+
listtype: listType,
|
|
59
|
+
organization_id: orgId,
|
|
60
|
+
});
|
|
61
|
+
if (existingItem) {
|
|
62
|
+
if (existingItem.name.toLowerCase() !== name.toLowerCase()) {
|
|
63
|
+
const nameExists = await this.listItemsRepo.findOneByCondition({
|
|
64
|
+
name,
|
|
65
|
+
listtype: listType,
|
|
66
|
+
organization_id: orgId,
|
|
67
|
+
});
|
|
68
|
+
if (nameExists && nameExists.id !== existingItem.id) {
|
|
69
|
+
throw new common_1.BadRequestException(`${name} already used by another item`);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
await this.updateEntity({
|
|
73
|
+
...existingItem,
|
|
74
|
+
...item,
|
|
75
|
+
name,
|
|
76
|
+
listtype: listType,
|
|
77
|
+
}, loggedInUser);
|
|
78
|
+
continue;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
const nameExists = await this.listItemsRepo.findOneByCondition({
|
|
63
82
|
name,
|
|
64
83
|
listtype: listType,
|
|
65
84
|
organization_id: orgId,
|
|
66
85
|
});
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
...item,
|
|
72
|
-
listtype: listType,
|
|
73
|
-
}, loggedInUser);
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
86
|
+
if (nameExists) {
|
|
87
|
+
throw new common_1.BadRequestException(`list item with name ${name} already exists`);
|
|
88
|
+
}
|
|
89
|
+
const finalCode = code || '';
|
|
76
90
|
await this.createEntity({
|
|
77
91
|
...item,
|
|
78
|
-
listtype: listType,
|
|
79
92
|
name,
|
|
93
|
+
code: finalCode,
|
|
94
|
+
listtype: listType,
|
|
80
95
|
value: '',
|
|
81
96
|
}, loggedInUser);
|
|
82
97
|
}
|
|
98
|
+
catch (error) {
|
|
99
|
+
errors.push({
|
|
100
|
+
row: i,
|
|
101
|
+
error: [
|
|
102
|
+
{
|
|
103
|
+
field: 'name',
|
|
104
|
+
message: error.message || 'An error occurred while processing the item',
|
|
105
|
+
},
|
|
106
|
+
],
|
|
107
|
+
});
|
|
108
|
+
}
|
|
83
109
|
}
|
|
84
110
|
const updatedItems = await this.listItemsRepo.findAllItemsByListType(listType, 'asc', orgId);
|
|
85
111
|
return {
|
|
112
|
+
success: errors.length === 0,
|
|
86
113
|
listType,
|
|
114
|
+
errors,
|
|
87
115
|
items: updatedItems,
|
|
88
116
|
};
|
|
89
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-master-item.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master-item.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAMwB;AACxB,6FAAuF;AACvF,gGAAwF;AAExF,wFAA+E;AAGxE,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YACmB,aAAwC,EACxC,cAAyC,EAEzC,iBAAoC;QAHpC,kBAAa,GAAb,aAAa,CAA2B;QACxC,mBAAc,GAAd,cAAc,CAA2B;QAEzC,sBAAiB,GAAjB,iBAAiB,CAAmB;IACpD,CAAC;IAEJ,KAAK,CAAC,wBAAwB,CAC5B,QAAgB,EAChB,eAAuB,EACvB,MAAe;QAGf,OAAO,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAC9C,QAAQ,EACR,KAAK,EACL,eAAe,EACf,MAAM,CACP,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,UAAe,EAAE,YAAsB;QACxD,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,4CAAoB,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAEzE,UAAU,CAAC,IAAI,GAAG,aAAa,CAAC;YAChC,UAAU,CAAC,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;YAC1D,UAAU,CAAC,KAAK,GAAG,aAAa,CAAC;YAEjC,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC9C,UAAU,EACV,YAAY,CACb,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,UAAe,EAAE,YAAsB;QACxD,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,QAAgB,EAChB,KAAY,EACZ,YAAY;QAEZ,MAAM,KAAK,GAAG,YAAY,CAAC,eAAe,CAAC;QAE3C,
|
|
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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"}
|