@things-factory/biz-base 4.0.37 → 4.0.41
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/bizplace/bizplace.js +15 -1
- package/dist-server/service/bizplace/bizplace.js.map +1 -1
- package/dist-server/service/contact-point/contact-point-mutation.js +4 -4
- package/dist-server/service/contact-point/contact-point-mutation.js.map +1 -1
- package/package.json +3 -3
- package/server/service/bizplace/bizplace.ts +14 -0
- package/server/service/contact-point/contact-point-mutation.ts +5 -3
|
@@ -18,6 +18,19 @@ const shell_1 = require("@things-factory/shell");
|
|
|
18
18
|
const biz_option_1 = require("../biz-option/biz-option");
|
|
19
19
|
const company_1 = require("../company/company");
|
|
20
20
|
let Bizplace = class Bizplace {
|
|
21
|
+
constructor(obj) {
|
|
22
|
+
if (obj) {
|
|
23
|
+
this.id = obj.Bizplace_id;
|
|
24
|
+
this.name = obj.Bizplace_name;
|
|
25
|
+
this.description = obj.Bizplace_description;
|
|
26
|
+
this.address = obj.Bizplace_address;
|
|
27
|
+
this.postalCode = obj.Bizplace_postal_code;
|
|
28
|
+
this.latlng = obj.Bizplace_latlng;
|
|
29
|
+
this.status = obj.Bizplace_status;
|
|
30
|
+
this.createdAt = obj.Bizplace_created_at;
|
|
31
|
+
this.updatedAt = obj.Bizplace_updated_at;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
21
34
|
};
|
|
22
35
|
__decorate([
|
|
23
36
|
(0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
|
|
@@ -107,7 +120,8 @@ Bizplace = __decorate([
|
|
|
107
120
|
(0, typeorm_1.Entity)(),
|
|
108
121
|
(0, typeorm_1.Index)('ix_bizplaces_0', (bizplace) => [bizplace.name], { unique: true }),
|
|
109
122
|
(0, typeorm_1.Index)('ix_bizplaces_1', (company) => [company.domain], { unique: false }),
|
|
110
|
-
(0, type_graphql_1.ObjectType)()
|
|
123
|
+
(0, type_graphql_1.ObjectType)(),
|
|
124
|
+
__metadata("design:paramtypes", [Object])
|
|
111
125
|
], Bizplace);
|
|
112
126
|
exports.Bizplace = Bizplace;
|
|
113
127
|
//# sourceMappingURL=bizplace.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bizplace.js","sourceRoot":"","sources":["../../../server/service/bizplace/bizplace.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoD;AACpD,qCAWgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAE9C,yDAAoD;AACpD,gDAA4C;AAM5C,IAAa,QAAQ,GAArB,MAAa,QAAQ;
|
|
1
|
+
{"version":3,"file":"bizplace.js","sourceRoot":"","sources":["../../../server/service/bizplace/bizplace.ts"],"names":[],"mappings":"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"}
|
|
@@ -142,15 +142,15 @@ async function createContactPoint(contactPoint, context, tx) {
|
|
|
142
142
|
}
|
|
143
143
|
exports.createContactPoint = createContactPoint;
|
|
144
144
|
async function updateContactPoint(id, patch, context, tx) {
|
|
145
|
-
var _a;
|
|
145
|
+
var _a, _b;
|
|
146
146
|
const bizplaceRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(bizplace_1.Bizplace)) || (0, typeorm_1.getRepository)(bizplace_1.Bizplace);
|
|
147
147
|
const contactPointRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(contact_point_1.ContactPoint)) || (0, typeorm_1.getRepository)(contact_point_1.ContactPoint);
|
|
148
148
|
const { domain, user } = context.state;
|
|
149
|
-
let contactPoint = await contactPointRepo.findOne(id);
|
|
150
|
-
if (!((_a =
|
|
149
|
+
let contactPoint = await contactPointRepo.findOne({ where: { id }, relations: ['bizplace'] });
|
|
150
|
+
if (!((_a = contactPoint === null || contactPoint === void 0 ? void 0 : contactPoint.bizplace) === null || _a === void 0 ? void 0 : _a.id)) {
|
|
151
151
|
patch.bizplace = await bizplaceRepo.findOne({ where: { name: domain.name } });
|
|
152
152
|
}
|
|
153
|
-
|
|
153
|
+
if ((_b = patch === null || patch === void 0 ? void 0 : patch.bizplace) === null || _b === void 0 ? void 0 : _b.id) {
|
|
154
154
|
patch.bizplace = await bizplaceRepo.findOne(patch.bizplace.id);
|
|
155
155
|
}
|
|
156
156
|
return await contactPointRepo.save(Object.assign(Object.assign(Object.assign({}, contactPoint), patch), { updater: user }));
|
|
@@ -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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/biz-base",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.41",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/auth-base": "^4.0.
|
|
27
|
+
"@things-factory/auth-base": "^4.0.41"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "1dd445b5b5e5b9e37291dc274886131199d7bf6a"
|
|
30
30
|
}
|
|
@@ -91,4 +91,18 @@ export class Bizplace {
|
|
|
91
91
|
@UpdateDateColumn()
|
|
92
92
|
@Field({ nullable: true })
|
|
93
93
|
updatedAt: Date
|
|
94
|
+
|
|
95
|
+
constructor(obj?) {
|
|
96
|
+
if (obj) {
|
|
97
|
+
this.id = obj.Bizplace_id
|
|
98
|
+
this.name = obj.Bizplace_name
|
|
99
|
+
this.description = obj.Bizplace_description
|
|
100
|
+
this.address = obj.Bizplace_address
|
|
101
|
+
this.postalCode = obj.Bizplace_postal_code
|
|
102
|
+
this.latlng = obj.Bizplace_latlng
|
|
103
|
+
this.status = obj.Bizplace_status
|
|
104
|
+
this.createdAt = obj.Bizplace_created_at
|
|
105
|
+
this.updatedAt = obj.Bizplace_updated_at
|
|
106
|
+
}
|
|
107
|
+
}
|
|
94
108
|
}
|
|
@@ -140,11 +140,13 @@ export async function updateContactPoint(
|
|
|
140
140
|
const contactPointRepo: Repository<ContactPoint> = tx?.getRepository(ContactPoint) || getRepository(ContactPoint)
|
|
141
141
|
|
|
142
142
|
const { domain, user }: { domain: Domain; user: User } = context.state
|
|
143
|
-
let contactPoint: ContactPoint = await contactPointRepo.findOne(id)
|
|
143
|
+
let contactPoint: ContactPoint = await contactPointRepo.findOne({ where: { id }, relations: ['bizplace'] })
|
|
144
144
|
|
|
145
|
-
if (!
|
|
145
|
+
if (!contactPoint?.bizplace?.id) {
|
|
146
146
|
patch.bizplace = await bizplaceRepo.findOne({ where: { name: domain.name } })
|
|
147
|
-
}
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
if (patch?.bizplace?.id) {
|
|
148
150
|
patch.bizplace = await bizplaceRepo.findOne(patch.bizplace.id)
|
|
149
151
|
}
|
|
150
152
|
|