@things-factory/biz-base 4.3.815 → 4.3.819
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-server/service/contact-point/contact-point-mutation.js +57 -4
- package/dist-server/service/contact-point/contact-point-mutation.js.map +1 -1
- package/dist-server/service/contact-point/contact-point-query.js +2 -1
- package/dist-server/service/contact-point/contact-point-query.js.map +1 -1
- package/dist-server/service/contact-point/contact-point.js +12 -2
- package/dist-server/service/contact-point/contact-point.js.map +1 -1
- package/dist-server/service/index.js +3 -1
- package/dist-server/service/index.js.map +1 -1
- package/package.json +2 -2
- package/server/service/contact-point/contact-point-mutation.ts +91 -2
- package/server/service/contact-point/contact-point-query.ts +2 -1
- package/server/service/contact-point/contact-point.ts +10 -2
- package/server/service/index.ts +1 -0
|
@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.deleteContactPoint = exports.updateContactPoint = exports.createContactPoint = exports.ContactPointMutation = void 0;
|
|
15
|
+
exports.checkDuplicateContactPoint = exports.deleteContactPoint = exports.updateContactPoint = exports.createContactPoint = exports.ContactPointMutation = void 0;
|
|
16
16
|
const type_graphql_1 = require("type-graphql");
|
|
17
17
|
const typeorm_1 = require("typeorm");
|
|
18
18
|
const bizplace_1 = require("../bizplace/bizplace");
|
|
@@ -73,7 +73,7 @@ let ContactPointMutation = class ContactPointMutation {
|
|
|
73
73
|
return true;
|
|
74
74
|
}
|
|
75
75
|
async deleteContactPoints(ids, context) {
|
|
76
|
-
await (0, typeorm_1.getRepository)(contact_point_1.ContactPoint).
|
|
76
|
+
await (0, typeorm_1.getRepository)(contact_point_1.ContactPoint).update(ids, { deletedAt: new Date() });
|
|
77
77
|
return true;
|
|
78
78
|
}
|
|
79
79
|
};
|
|
@@ -141,11 +141,26 @@ async function createContactPoint(contactPoint, context, tx) {
|
|
|
141
141
|
if (contactPoint.customerCode && !/^[a-zA-Z0-9]*$/.test(contactPoint.customerCode)) {
|
|
142
142
|
throw new Error('customerCode must be alphanumeric only');
|
|
143
143
|
}
|
|
144
|
+
if (contactPoint.phone && !/^[0-9+\-\s().]*$/.test(contactPoint.phone)) {
|
|
145
|
+
throw new Error('phone must contain only numbers and special characters (+, -, (, ), .)');
|
|
146
|
+
}
|
|
147
|
+
if (contactPoint.email && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(contactPoint.email)) {
|
|
148
|
+
throw new Error('Invalid email format');
|
|
149
|
+
}
|
|
150
|
+
await checkDuplicateContactPoint(domain.id, contactPoint.bizplace.id, {
|
|
151
|
+
type: contactPoint.type,
|
|
152
|
+
companyName: contactPoint.companyName,
|
|
153
|
+
address: contactPoint.address,
|
|
154
|
+
postCode: contactPoint.postCode,
|
|
155
|
+
city: contactPoint.city,
|
|
156
|
+
country: contactPoint.country,
|
|
157
|
+
state: contactPoint.state
|
|
158
|
+
}, undefined, tx);
|
|
144
159
|
return await contactPointRepo.save(Object.assign(Object.assign({}, contactPoint), { domain, creator: user, updater: user }));
|
|
145
160
|
}
|
|
146
161
|
exports.createContactPoint = createContactPoint;
|
|
147
162
|
async function updateContactPoint(id, patch, context, tx) {
|
|
148
|
-
var _a, _b;
|
|
163
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
149
164
|
const bizplaceRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(bizplace_1.Bizplace)) || (0, typeorm_1.getRepository)(bizplace_1.Bizplace);
|
|
150
165
|
const contactPointRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(contact_point_1.ContactPoint)) || (0, typeorm_1.getRepository)(contact_point_1.ContactPoint);
|
|
151
166
|
const { domain, user } = context.state;
|
|
@@ -159,12 +174,50 @@ async function updateContactPoint(id, patch, context, tx) {
|
|
|
159
174
|
if (patch.customerCode && !/^[a-zA-Z0-9]*$/.test(patch.customerCode)) {
|
|
160
175
|
throw new Error('Customer Code must be alphanumeric only');
|
|
161
176
|
}
|
|
177
|
+
if (patch.phone && !/^[0-9+\-\s().]*$/.test(patch.phone)) {
|
|
178
|
+
throw new Error('phone must contain only numbers and special characters (+, -, (, ), .)');
|
|
179
|
+
}
|
|
180
|
+
if (patch.email && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(patch.email)) {
|
|
181
|
+
throw new Error('Invalid email format');
|
|
182
|
+
}
|
|
183
|
+
await checkDuplicateContactPoint(domain.id, contactPoint.bizplace.id, {
|
|
184
|
+
type: (_c = patch.type) !== null && _c !== void 0 ? _c : contactPoint.type,
|
|
185
|
+
companyName: (_d = patch.companyName) !== null && _d !== void 0 ? _d : contactPoint.companyName,
|
|
186
|
+
address: (_e = patch.address) !== null && _e !== void 0 ? _e : contactPoint.address,
|
|
187
|
+
postCode: (_f = patch.postCode) !== null && _f !== void 0 ? _f : contactPoint.postCode,
|
|
188
|
+
city: (_g = patch.city) !== null && _g !== void 0 ? _g : contactPoint.city,
|
|
189
|
+
country: (_h = patch.country) !== null && _h !== void 0 ? _h : contactPoint.country,
|
|
190
|
+
state: (_j = patch.state) !== null && _j !== void 0 ? _j : contactPoint.state
|
|
191
|
+
}, id, tx);
|
|
162
192
|
return await contactPointRepo.save(Object.assign(Object.assign(Object.assign({}, contactPoint), patch), { updater: user }));
|
|
163
193
|
}
|
|
164
194
|
exports.updateContactPoint = updateContactPoint;
|
|
165
195
|
async function deleteContactPoint(id, tx) {
|
|
166
196
|
const contactPointRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(contact_point_1.ContactPoint)) || (0, typeorm_1.getRepository)(contact_point_1.ContactPoint);
|
|
167
|
-
await contactPointRepo.
|
|
197
|
+
await contactPointRepo.update(id, { deletedAt: new Date() });
|
|
168
198
|
}
|
|
169
199
|
exports.deleteContactPoint = deleteContactPoint;
|
|
200
|
+
async function checkDuplicateContactPoint(domainId, bizplaceId, data, excludeId, tx) {
|
|
201
|
+
const repo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(contact_point_1.ContactPoint)) || (0, typeorm_1.getRepository)(contact_point_1.ContactPoint);
|
|
202
|
+
const qb = repo
|
|
203
|
+
.createQueryBuilder('cp')
|
|
204
|
+
.where('cp.domain_id = :domainId', { domainId })
|
|
205
|
+
.andWhere('cp.bizplace_id = :bizplaceId', { bizplaceId })
|
|
206
|
+
.andWhere('cp.type = :type', { type: data.type })
|
|
207
|
+
.andWhere('cp.companyName = :companyName', { companyName: data.companyName })
|
|
208
|
+
.andWhere('cp.address = :address', { address: data.address })
|
|
209
|
+
.andWhere('cp.postCode = :postCode', { postCode: data.postCode })
|
|
210
|
+
.andWhere('cp.city = :city', { city: data.city })
|
|
211
|
+
.andWhere('cp.country = :country', { country: data.country })
|
|
212
|
+
.andWhere('cp.state = :state', { state: data.state })
|
|
213
|
+
.andWhere('cp.deleted_at IS NULL');
|
|
214
|
+
if (excludeId) {
|
|
215
|
+
qb.andWhere('cp.id != :excludeId', { excludeId });
|
|
216
|
+
}
|
|
217
|
+
const existing = await qb.getOne();
|
|
218
|
+
if (existing) {
|
|
219
|
+
throw new Error(`A contact point with the same combination already exists (type: ${data.type}, companyName: ${data.companyName}, address: ${data.address}, postCode: ${data.postCode}, city: ${data.city}, country: ${data.country}, state: ${data.state})`);
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
exports.checkDuplicateContactPoint = checkDuplicateContactPoint;
|
|
170
223
|
//# sourceMappingURL=contact-point-mutation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact-point-mutation.js","sourceRoot":"","sources":["../../../server/service/contact-point/contact-point-mutation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"contact-point-mutation.js","sourceRoot":"","sources":["../../../server/service/contact-point/contact-point-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ const contact_point_types_1 = require("./contact-point-types");
|
|
|
22
22
|
let ContactPointQuery = class ContactPointQuery {
|
|
23
23
|
async contactPoint(name, context) {
|
|
24
24
|
return await (0, typeorm_1.getRepository)(contact_point_1.ContactPoint).findOne({
|
|
25
|
-
where: { domain: context.state.domain, name },
|
|
25
|
+
where: { domain: context.state.domain, name, deletedAt: null },
|
|
26
26
|
relations: ['domain', 'bizplace', 'creator', 'updater']
|
|
27
27
|
});
|
|
28
28
|
}
|
|
@@ -34,6 +34,7 @@ let ContactPointQuery = class ContactPointQuery {
|
|
|
34
34
|
.leftJoinAndSelect('ContactPoint.bizplace', 'Bizplace')
|
|
35
35
|
.leftJoinAndSelect('ContactPoint.creator', 'Creator')
|
|
36
36
|
.leftJoinAndSelect('ContactPoint.updater', 'Updater')
|
|
37
|
+
.andWhere('ContactPoint.deletedAt IS NULL')
|
|
37
38
|
.getManyAndCount();
|
|
38
39
|
return { items, total };
|
|
39
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact-point-query.js","sourceRoot":"","sources":["../../../server/service/contact-point/contact-point-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAAyE;AACzE,qCAAuC;AAEvC,iDAA6D;AAE7D,mDAA8C;AAC9C,+DAAwD;AAGjD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAGtB,AAAN,KAAK,CAAC,YAAY,CAAc,IAAY,EAAS,OAAY;QAC/D,OAAO,MAAM,IAAA,uBAAa,EAAC,4BAAY,CAAC,CAAC,OAAO,CAAC;YAC/C,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"contact-point-query.js","sourceRoot":"","sources":["../../../server/service/contact-point/contact-point-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAAyE;AACzE,qCAAuC;AAEvC,iDAA6D;AAE7D,mDAA8C;AAC9C,+DAAwD;AAGjD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAGtB,AAAN,KAAK,CAAC,YAAY,CAAc,IAAY,EAAS,OAAY;QAC/D,OAAO,MAAM,IAAA,uBAAa,EAAC,4BAAY,CAAC,CAAC,OAAO,CAAC;YAC/C,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE;YAC9D,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC;SACxD,CAAC,CAAA;IACJ,CAAC;IAIK,AAAN,KAAK,CAAC,aAAa,CAAS,MAAiB,EAAS,OAAY;QAChE,MAAM,YAAY,GAAG,IAAA,uBAAa,EAAC,4BAAY,CAAC,CAAC,kBAAkB,EAAE,CAAA;QACrE,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY;aACtC,iBAAiB,CAAC,qBAAqB,EAAE,QAAQ,CAAC;aAClD,iBAAiB,CAAC,uBAAuB,EAAE,UAAU,CAAC;aACtD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC;aACpD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC;aACpD,QAAQ,CAAC,gCAAgC,CAAC;aAC1C,eAAe,EAAE,CAAA;QAEpB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA;AAvBO;IAFL,IAAA,wBAAS,EAAC,2DAA2D,CAAC;IACtE,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,4BAAY,CAAC;IACX,WAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;IAAgB,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;qDAKnD;AAIK;IAFL,IAAA,wBAAS,EAAC,2DAA2D,CAAC;IACtE,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,sCAAgB,CAAC;IACd,WAAA,IAAA,mBAAI,GAAE,CAAA;IAAqB,WAAA,IAAA,kBAAG,GAAE,CAAA;;yDAAjB,iBAAS,oBAAT,iBAAS;;sDAa5C;AAzBU,iBAAiB;IAD7B,IAAA,uBAAQ,EAAC,4BAAY,CAAC;GACV,iBAAiB,CA0B7B;AA1BY,8CAAiB"}
|
|
@@ -44,8 +44,8 @@ __decorate([
|
|
|
44
44
|
__metadata("design:type", bizplace_1.Bizplace)
|
|
45
45
|
], ContactPoint.prototype, "bizplace", void 0);
|
|
46
46
|
__decorate([
|
|
47
|
-
(0, typeorm_1.Column)(),
|
|
48
|
-
(0, type_graphql_1.Field)(),
|
|
47
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
48
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
49
49
|
__metadata("design:type", String)
|
|
50
50
|
], ContactPoint.prototype, "name", void 0);
|
|
51
51
|
__decorate([
|
|
@@ -138,6 +138,11 @@ __decorate([
|
|
|
138
138
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
139
139
|
__metadata("design:type", String)
|
|
140
140
|
], ContactPoint.prototype, "customerCode", void 0);
|
|
141
|
+
__decorate([
|
|
142
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
143
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
144
|
+
__metadata("design:type", String)
|
|
145
|
+
], ContactPoint.prototype, "routeCode", void 0);
|
|
141
146
|
__decorate([
|
|
142
147
|
(0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
|
|
143
148
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
@@ -148,6 +153,11 @@ __decorate([
|
|
|
148
153
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
149
154
|
__metadata("design:type", typeof (_c = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _c : Object)
|
|
150
155
|
], ContactPoint.prototype, "updater", void 0);
|
|
156
|
+
__decorate([
|
|
157
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
158
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
159
|
+
__metadata("design:type", Date)
|
|
160
|
+
], ContactPoint.prototype, "deletedAt", void 0);
|
|
151
161
|
__decorate([
|
|
152
162
|
(0, typeorm_1.CreateDateColumn)(),
|
|
153
163
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact-point.js","sourceRoot":"","sources":["../../../server/service/contact-point/contact-point.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAA2E;AAC3E,qCAAsH;AACtH,yDAAgD;AAChD,iDAA8C;AAC9C,mDAA+C;AAE/C,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,sCAAyB,CAAA;IACzB,wCAA2B,CAAA;IAC3B,wBAAW,CAAA;AACb,CAAC,EAJW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAIpB;AAED,IAAA,+BAAgB,EAAC,SAAS,EAAE;IAC1B,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,oCAAoC;CAClD,CAAC,CAAA;AAgBK,IAAM,YAAY,GAAlB,MAAM,YAAY;
|
|
1
|
+
{"version":3,"file":"contact-point.js","sourceRoot":"","sources":["../../../server/service/contact-point/contact-point.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAA2E;AAC3E,qCAAsH;AACtH,yDAAgD;AAChD,iDAA8C;AAC9C,mDAA+C;AAE/C,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,sCAAyB,CAAA;IACzB,wCAA2B,CAAA;IAC3B,wBAAW,CAAA;AACb,CAAC,EAJW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAIpB;AAED,IAAA,+BAAgB,EAAC,SAAS,EAAE;IAC1B,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,oCAAoC;CAClD,CAAC,CAAA;AAgBK,IAAM,YAAY,GAAlB,MAAM,YAAY;CAgHxB,CAAA;AA/GC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;IAC9B,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,CAAC;;wCACR;AAEV;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;IACzB,IAAA,oBAAK,GAAE;kDACA,cAAM,oBAAN,cAAM;4CAAA;AAEd;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mBAAQ,CAAC;IAC3B,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,mBAAQ,CAAC;8BACd,mBAAQ;8CAAA;AAElB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACd;AAEZ;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAEb;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACX;AAEf;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACV;AAEhB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACV;AAEhB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACd;AAEZ;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACX;AAEf;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAEb;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACJ;AAEtB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACf;AAEX;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAEb;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACP;AAEnB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACT;AAEjB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACd;AAEZ;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACP;AAEnB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IACnD,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACf;AAExB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAEvB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IACzD,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC9B;AAEf;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACN;AAEpB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACT;AAEjB;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC3C,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACjB,gBAAI,oBAAJ,gBAAI;6CAAA;AAEb;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC3C,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACjB,gBAAI,oBAAJ,gBAAI;6CAAA;AAEb;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;+CAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;+CAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;+CAAA;AA/GJ,YAAY;IAdxB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,qBAAqB,EACrB,CAAC,YAA0B,EAAE,EAAE,CAAC;QAC9B,YAAY,CAAC,IAAI;QACjB,YAAY,CAAC,KAAK;QAClB,YAAY,CAAC,WAAW;QACxB,YAAY,CAAC,OAAO;QACpB,YAAY,CAAC,cAAc;QAC3B,YAAY,CAAC,SAAS;KACvB,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;IACA,IAAA,yBAAU,GAAE;GACA,YAAY,CAgHxB;AAhHY,oCAAY"}
|
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.updateWorker = exports.deleteWorkers = exports.deleteWorker = exports.createWorker = exports.updateCompany = exports.deleteCompany = exports.deleteCompanies = exports.createCompany = exports.schema = exports.entities = void 0;
|
|
17
|
+
exports.checkDuplicateContactPoint = exports.updateWorker = exports.deleteWorkers = exports.deleteWorker = exports.createWorker = exports.updateCompany = exports.deleteCompany = exports.deleteCompanies = exports.createCompany = exports.schema = exports.entities = void 0;
|
|
18
18
|
/* IMPORT ENTITIES AND RESOLVERS */
|
|
19
19
|
const biz_option_1 = require("./biz-option");
|
|
20
20
|
const biz_option_detail_1 = require("./biz-option-detail");
|
|
@@ -64,4 +64,6 @@ Object.defineProperty(exports, "createWorker", { enumerable: true, get: function
|
|
|
64
64
|
Object.defineProperty(exports, "deleteWorker", { enumerable: true, get: function () { return worker_mutation_1.deleteWorker; } });
|
|
65
65
|
Object.defineProperty(exports, "deleteWorkers", { enumerable: true, get: function () { return worker_mutation_1.deleteWorkers; } });
|
|
66
66
|
Object.defineProperty(exports, "updateWorker", { enumerable: true, get: function () { return worker_mutation_1.updateWorker; } });
|
|
67
|
+
var contact_point_mutation_1 = require("./contact-point/contact-point-mutation");
|
|
68
|
+
Object.defineProperty(exports, "checkDuplicateContactPoint", { enumerable: true, get: function () { return contact_point_mutation_1.checkDuplicateContactPoint; } });
|
|
67
69
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mCAAmC;AACnC,6CAA6F;AAC7F,2DAAgH;AAChH,yCAAyF;AACzF,uCAAsF;AACtF,mDAAsG;AACtG,qCAAmF;AAEnF,yBAAyB;AACzB,oDAAiC;AACjC,sDAAmC;AACnC,0DAAuC;AACvC,wEAAqD;AACrD,gEAA6C;AAC7C,kDAA+B;AAE/B,kBAAkB;AAClB,0DAAuC;AACvC,4DAAyC;AACzC,gEAA6C;AAC7C,8EAA2D;AAC3D,sEAAmD;AACnD,wDAAqC;AAExB,QAAA,QAAQ,GAAG;IACtB,GAAG,kBAAe;IAClB,GAAG,mBAAgB;IACnB,GAAG,qBAAiB;IACpB,GAAG,4BAAuB;IAC1B,GAAG,wBAAoB;IACvB,GAAG,iBAAc;CAClB,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,eAAe,EAAE;QACf,GAAG,mBAAgB;QACnB,GAAG,oBAAiB;QACpB,GAAG,sBAAkB;QACrB,GAAG,6BAAwB;QAC3B,GAAG,yBAAqB;QACxB,GAAG,kBAAe;KACnB;CACF,CAAA;AAED,+DAAyG;AAAhG,iHAAA,aAAa,OAAA;AAAE,mHAAA,eAAe,OAAA;AAAE,iHAAA,aAAa,OAAA;AAAE,iHAAA,aAAa,OAAA;AACrE,4DAAkG;AAAzF,+GAAA,YAAY,OAAA;AAAE,+GAAA,YAAY,OAAA;AAAE,gHAAA,aAAa,OAAA;AAAE,+GAAA,YAAY,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mCAAmC;AACnC,6CAA6F;AAC7F,2DAAgH;AAChH,yCAAyF;AACzF,uCAAsF;AACtF,mDAAsG;AACtG,qCAAmF;AAEnF,yBAAyB;AACzB,oDAAiC;AACjC,sDAAmC;AACnC,0DAAuC;AACvC,wEAAqD;AACrD,gEAA6C;AAC7C,kDAA+B;AAE/B,kBAAkB;AAClB,0DAAuC;AACvC,4DAAyC;AACzC,gEAA6C;AAC7C,8EAA2D;AAC3D,sEAAmD;AACnD,wDAAqC;AAExB,QAAA,QAAQ,GAAG;IACtB,GAAG,kBAAe;IAClB,GAAG,mBAAgB;IACnB,GAAG,qBAAiB;IACpB,GAAG,4BAAuB;IAC1B,GAAG,wBAAoB;IACvB,GAAG,iBAAc;CAClB,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,eAAe,EAAE;QACf,GAAG,mBAAgB;QACnB,GAAG,oBAAiB;QACpB,GAAG,sBAAkB;QACrB,GAAG,6BAAwB;QAC3B,GAAG,yBAAqB;QACxB,GAAG,kBAAe;KACnB;CACF,CAAA;AAED,+DAAyG;AAAhG,iHAAA,aAAa,OAAA;AAAE,mHAAA,eAAe,OAAA;AAAE,iHAAA,aAAa,OAAA;AAAE,iHAAA,aAAa,OAAA;AACrE,4DAAkG;AAAzF,+GAAA,YAAY,OAAA;AAAE,+GAAA,YAAY,OAAA;AAAE,gHAAA,aAAa,OAAA;AAAE,+GAAA,YAAY,OAAA;AAChE,iFAAmF;AAA1E,oIAAA,0BAA0B,OAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/biz-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.819",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -25,5 +25,5 @@
|
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@things-factory/auth-base": "^4.3.815"
|
|
27
27
|
},
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "c6a6478dad09702aeafad6a491bf9936ade6a1fe"
|
|
29
29
|
}
|
|
@@ -100,7 +100,7 @@ export class ContactPointMutation {
|
|
|
100
100
|
@Directive('@privilege(category: "contact_point", privilege: "mutation")')
|
|
101
101
|
@Mutation(returns => Boolean)
|
|
102
102
|
async deleteContactPoints(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<Boolean> {
|
|
103
|
-
await getRepository(ContactPoint).
|
|
103
|
+
await getRepository(ContactPoint).update(ids, { deletedAt: new Date() })
|
|
104
104
|
|
|
105
105
|
return true
|
|
106
106
|
}
|
|
@@ -126,6 +126,30 @@ export async function createContactPoint(
|
|
|
126
126
|
throw new Error('customerCode must be alphanumeric only')
|
|
127
127
|
}
|
|
128
128
|
|
|
129
|
+
if (contactPoint.phone && !/^[0-9+\-\s().]*$/.test(contactPoint.phone)) {
|
|
130
|
+
throw new Error('phone must contain only numbers and special characters (+, -, (, ), .)')
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
if (contactPoint.email && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(contactPoint.email)) {
|
|
134
|
+
throw new Error('Invalid email format')
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
await checkDuplicateContactPoint(
|
|
138
|
+
domain.id,
|
|
139
|
+
contactPoint.bizplace.id,
|
|
140
|
+
{
|
|
141
|
+
type: contactPoint.type,
|
|
142
|
+
companyName: contactPoint.companyName,
|
|
143
|
+
address: contactPoint.address,
|
|
144
|
+
postCode: contactPoint.postCode,
|
|
145
|
+
city: contactPoint.city,
|
|
146
|
+
country: contactPoint.country,
|
|
147
|
+
state: contactPoint.state
|
|
148
|
+
},
|
|
149
|
+
undefined,
|
|
150
|
+
tx
|
|
151
|
+
)
|
|
152
|
+
|
|
129
153
|
return await contactPointRepo.save({
|
|
130
154
|
...contactPoint,
|
|
131
155
|
domain,
|
|
@@ -158,6 +182,30 @@ export async function updateContactPoint(
|
|
|
158
182
|
throw new Error('Customer Code must be alphanumeric only')
|
|
159
183
|
}
|
|
160
184
|
|
|
185
|
+
if (patch.phone && !/^[0-9+\-\s().]*$/.test(patch.phone)) {
|
|
186
|
+
throw new Error('phone must contain only numbers and special characters (+, -, (, ), .)')
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
if (patch.email && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(patch.email)) {
|
|
190
|
+
throw new Error('Invalid email format')
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
await checkDuplicateContactPoint(
|
|
194
|
+
domain.id,
|
|
195
|
+
contactPoint.bizplace.id,
|
|
196
|
+
{
|
|
197
|
+
type: patch.type ?? contactPoint.type,
|
|
198
|
+
companyName: patch.companyName ?? contactPoint.companyName,
|
|
199
|
+
address: patch.address ?? contactPoint.address,
|
|
200
|
+
postCode: patch.postCode ?? contactPoint.postCode,
|
|
201
|
+
city: patch.city ?? contactPoint.city,
|
|
202
|
+
country: patch.country ?? contactPoint.country,
|
|
203
|
+
state: patch.state ?? contactPoint.state
|
|
204
|
+
},
|
|
205
|
+
id,
|
|
206
|
+
tx
|
|
207
|
+
)
|
|
208
|
+
|
|
161
209
|
return await contactPointRepo.save({
|
|
162
210
|
...contactPoint,
|
|
163
211
|
...patch,
|
|
@@ -167,5 +215,46 @@ export async function updateContactPoint(
|
|
|
167
215
|
|
|
168
216
|
export async function deleteContactPoint(id: string, tx?: EntityManager): Promise<void> {
|
|
169
217
|
const contactPointRepo: Repository<ContactPoint> = tx?.getRepository(ContactPoint) || getRepository(ContactPoint)
|
|
170
|
-
await contactPointRepo.
|
|
218
|
+
await contactPointRepo.update(id, { deletedAt: new Date() })
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
export async function checkDuplicateContactPoint(
|
|
222
|
+
domainId: string,
|
|
223
|
+
bizplaceId: string,
|
|
224
|
+
data: {
|
|
225
|
+
type: string
|
|
226
|
+
companyName: string
|
|
227
|
+
address: string
|
|
228
|
+
postCode: string
|
|
229
|
+
city: string
|
|
230
|
+
country: string
|
|
231
|
+
state: string
|
|
232
|
+
},
|
|
233
|
+
excludeId?: string,
|
|
234
|
+
tx?: EntityManager
|
|
235
|
+
): Promise<void> {
|
|
236
|
+
const repo: Repository<ContactPoint> = tx?.getRepository(ContactPoint) || getRepository(ContactPoint)
|
|
237
|
+
const qb = repo
|
|
238
|
+
.createQueryBuilder('cp')
|
|
239
|
+
.where('cp.domain_id = :domainId', { domainId })
|
|
240
|
+
.andWhere('cp.bizplace_id = :bizplaceId', { bizplaceId })
|
|
241
|
+
.andWhere('cp.type = :type', { type: data.type })
|
|
242
|
+
.andWhere('cp.companyName = :companyName', { companyName: data.companyName })
|
|
243
|
+
.andWhere('cp.address = :address', { address: data.address })
|
|
244
|
+
.andWhere('cp.postCode = :postCode', { postCode: data.postCode })
|
|
245
|
+
.andWhere('cp.city = :city', { city: data.city })
|
|
246
|
+
.andWhere('cp.country = :country', { country: data.country })
|
|
247
|
+
.andWhere('cp.state = :state', { state: data.state })
|
|
248
|
+
.andWhere('cp.deleted_at IS NULL')
|
|
249
|
+
|
|
250
|
+
if (excludeId) {
|
|
251
|
+
qb.andWhere('cp.id != :excludeId', { excludeId })
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
const existing = await qb.getOne()
|
|
255
|
+
if (existing) {
|
|
256
|
+
throw new Error(
|
|
257
|
+
`A contact point with the same combination already exists (type: ${data.type}, companyName: ${data.companyName}, address: ${data.address}, postCode: ${data.postCode}, city: ${data.city}, country: ${data.country}, state: ${data.state})`
|
|
258
|
+
)
|
|
259
|
+
}
|
|
171
260
|
}
|
|
@@ -12,7 +12,7 @@ export class ContactPointQuery {
|
|
|
12
12
|
@Query(returns => ContactPoint)
|
|
13
13
|
async contactPoint(@Arg('name') name: string, @Ctx() context: any): Promise<ContactPoint> {
|
|
14
14
|
return await getRepository(ContactPoint).findOne({
|
|
15
|
-
where: { domain: context.state.domain, name },
|
|
15
|
+
where: { domain: context.state.domain, name, deletedAt: null },
|
|
16
16
|
relations: ['domain', 'bizplace', 'creator', 'updater']
|
|
17
17
|
})
|
|
18
18
|
}
|
|
@@ -28,6 +28,7 @@ export class ContactPointQuery {
|
|
|
28
28
|
.leftJoinAndSelect('ContactPoint.bizplace', 'Bizplace')
|
|
29
29
|
.leftJoinAndSelect('ContactPoint.creator', 'Creator')
|
|
30
30
|
.leftJoinAndSelect('ContactPoint.updater', 'Updater')
|
|
31
|
+
.andWhere('ContactPoint.deletedAt IS NULL')
|
|
31
32
|
.getManyAndCount()
|
|
32
33
|
|
|
33
34
|
return { items, total }
|
|
@@ -42,8 +42,8 @@ export class ContactPoint {
|
|
|
42
42
|
@Field(type => Bizplace)
|
|
43
43
|
bizplace: Bizplace
|
|
44
44
|
|
|
45
|
-
@Column()
|
|
46
|
-
@Field()
|
|
45
|
+
@Column({ nullable: true })
|
|
46
|
+
@Field({ nullable: true })
|
|
47
47
|
name: string
|
|
48
48
|
|
|
49
49
|
@Column({ nullable: true })
|
|
@@ -118,6 +118,10 @@ export class ContactPoint {
|
|
|
118
118
|
@Field({ nullable: true })
|
|
119
119
|
customerCode: string
|
|
120
120
|
|
|
121
|
+
@Column({ nullable: true })
|
|
122
|
+
@Field({ nullable: true })
|
|
123
|
+
routeCode: string
|
|
124
|
+
|
|
121
125
|
@ManyToOne(type => User, { nullable: true })
|
|
122
126
|
@Field({ nullable: true })
|
|
123
127
|
creator: User
|
|
@@ -126,6 +130,10 @@ export class ContactPoint {
|
|
|
126
130
|
@Field({ nullable: true })
|
|
127
131
|
updater: User
|
|
128
132
|
|
|
133
|
+
@Column({ nullable: true })
|
|
134
|
+
@Field({ nullable: true })
|
|
135
|
+
deletedAt: Date
|
|
136
|
+
|
|
129
137
|
@CreateDateColumn()
|
|
130
138
|
@Field({ nullable: true })
|
|
131
139
|
createdAt: Date
|
package/server/service/index.ts
CHANGED
|
@@ -44,3 +44,4 @@ export const schema = {
|
|
|
44
44
|
|
|
45
45
|
export { createCompany, deleteCompanies, deleteCompany, updateCompany } from './company/company-mutation'
|
|
46
46
|
export { createWorker, deleteWorker, deleteWorkers, updateWorker } from './worker/worker-mutation'
|
|
47
|
+
export { checkDuplicateContactPoint } from './contact-point/contact-point-mutation'
|