@things-factory/transport-base 4.1.28 → 4.2.0
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/transport-driver/transport-driver-mutation.js +6 -1
- package/dist-server/service/transport-driver/transport-driver-mutation.js.map +1 -1
- package/dist-server/service/transport-driver/transport-driver-query.js +79 -4
- package/dist-server/service/transport-driver/transport-driver-query.js.map +1 -1
- package/dist-server/service/transport-driver/transport-driver-types.js +44 -0
- package/dist-server/service/transport-driver/transport-driver-types.js.map +1 -1
- package/dist-server/service/transport-driver/transport-driver.js +45 -4
- package/dist-server/service/transport-driver/transport-driver.js.map +1 -1
- package/dist-server/service/transport-vehicle/transport-vehicle-mutation.js +54 -0
- package/dist-server/service/transport-vehicle/transport-vehicle-mutation.js.map +1 -1
- package/dist-server/service/transport-vehicle/transport-vehicle-query.js +21 -0
- package/dist-server/service/transport-vehicle/transport-vehicle-query.js.map +1 -1
- package/dist-server/service/transport-vehicle/transport-vehicle.js +26 -0
- package/dist-server/service/transport-vehicle/transport-vehicle.js.map +1 -1
- package/package.json +3 -3
- package/server/service/transport-driver/transport-driver-mutation.ts +11 -2
- package/server/service/transport-driver/transport-driver-query.ts +58 -5
- package/server/service/transport-driver/transport-driver-types.ts +40 -6
- package/server/service/transport-driver/transport-driver.ts +37 -1
- package/server/service/transport-vehicle/transport-vehicle-mutation.ts +64 -2
- package/server/service/transport-vehicle/transport-vehicle-query.ts +16 -0
- package/server/service/transport-vehicle/transport-vehicle.ts +23 -0
|
@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.deleteTransportDrivers = exports.deleteTransportDriver = exports.updateTransportDriver = exports.createTransportDriver = exports.TransportDriverMutation = void 0;
|
|
16
16
|
const type_graphql_1 = require("type-graphql");
|
|
17
17
|
const typeorm_1 = require("typeorm");
|
|
18
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
18
19
|
const __1 = require("../");
|
|
19
20
|
const transport_driver_1 = require("./transport-driver");
|
|
20
21
|
const debug = require('debug')('things-factory:operato-wms:addTransportDriver');
|
|
@@ -115,7 +116,11 @@ async function createTransportDriver(transportDriver, domain, user, tx) {
|
|
|
115
116
|
const repository = tx
|
|
116
117
|
? tx.getRepository(transport_driver_1.TransportDriver)
|
|
117
118
|
: (0, typeorm_1.getRepository)(transport_driver_1.TransportDriver);
|
|
118
|
-
|
|
119
|
+
const existingUsers = (await tx.getRepository(transport_driver_1.TransportDriver).find({ relations: ['user'] })).map(driver => driver.userId);
|
|
120
|
+
if (existingUsers.includes(transportDriver.userId))
|
|
121
|
+
throw new Error('driver user already exists');
|
|
122
|
+
const driverUser = await tx.getRepository(auth_base_1.User).findOne({ where: { id: transportDriver.userId } });
|
|
123
|
+
return await repository.save(Object.assign(Object.assign({}, transportDriver), { user: driverUser, domain, creator: user, updater: user }));
|
|
119
124
|
}
|
|
120
125
|
exports.createTransportDriver = createTransportDriver;
|
|
121
126
|
async function updateTransportDriver(id, patch, domain, user, tx) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport-driver-mutation.js","sourceRoot":"","sources":["../../../server/service/transport-driver/transport-driver-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAsE;AACtE,qCAAsE;
|
|
1
|
+
{"version":3,"file":"transport-driver-mutation.js","sourceRoot":"","sources":["../../../server/service/transport-driver/transport-driver-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,14 +11,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
-
var _a;
|
|
14
|
+
var _a, _b;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.TransportDriverQuery = void 0;
|
|
17
17
|
const type_graphql_1 = require("type-graphql");
|
|
18
18
|
const typeorm_1 = require("typeorm");
|
|
19
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
20
|
+
const biz_base_1 = require("@things-factory/biz-base");
|
|
19
21
|
const shell_1 = require("@things-factory/shell");
|
|
20
|
-
const __1 = require("../");
|
|
21
22
|
const transport_driver_1 = require("./transport-driver");
|
|
23
|
+
const transport_driver_types_1 = require("./transport-driver-types");
|
|
22
24
|
let TransportDriverQuery = class TransportDriverQuery {
|
|
23
25
|
async transportDrivers(context, filters, pagination, sortings) {
|
|
24
26
|
const { domain, tx } = context.state;
|
|
@@ -39,18 +41,43 @@ let TransportDriverQuery = class TransportDriverQuery {
|
|
|
39
41
|
const [items, total] = await queryBuilder.getManyAndCount();
|
|
40
42
|
return { items, total };
|
|
41
43
|
}
|
|
44
|
+
async transportUserDrivers(context, filters, pagination, sortings) {
|
|
45
|
+
const { domain, tx } = context.state;
|
|
46
|
+
const convertedParams = (0, shell_1.convertListParams)({
|
|
47
|
+
filters,
|
|
48
|
+
pagination,
|
|
49
|
+
sortings
|
|
50
|
+
});
|
|
51
|
+
const [items, total] = await tx.getRepository(transport_driver_1.TransportDriver).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: ['domain', 'user', 'creator', 'updater'] }));
|
|
52
|
+
return { items, total };
|
|
53
|
+
}
|
|
42
54
|
async transportDriver(driverCode, context) {
|
|
43
55
|
const { domain, tx } = context.state;
|
|
44
56
|
return await tx.getRepository(transport_driver_1.TransportDriver).findOne({
|
|
45
57
|
where: { domain, driverCode, deletedAt: (0, typeorm_1.IsNull)() },
|
|
46
|
-
relations: ['domain', 'bizplace', 'creator', 'updater']
|
|
58
|
+
relations: ['domain', 'bizplace', 'creator', 'updater', 'transportVehicles']
|
|
47
59
|
});
|
|
48
60
|
}
|
|
61
|
+
async domain(transportDriver) {
|
|
62
|
+
return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(transportDriver.domainId);
|
|
63
|
+
}
|
|
64
|
+
async user(transportDriver) {
|
|
65
|
+
return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(transportDriver.userId);
|
|
66
|
+
}
|
|
67
|
+
async bizplace(transportDriver) {
|
|
68
|
+
return await (0, typeorm_1.getRepository)(biz_base_1.Bizplace).findOne(transportDriver.bizplaceId);
|
|
69
|
+
}
|
|
70
|
+
async updater(transportDriver) {
|
|
71
|
+
return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(transportDriver.updaterId);
|
|
72
|
+
}
|
|
73
|
+
async creator(transportDriver) {
|
|
74
|
+
return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(transportDriver.creatorId);
|
|
75
|
+
}
|
|
49
76
|
};
|
|
50
77
|
__decorate([
|
|
51
78
|
(0, type_graphql_1.Directive)('@transaction'),
|
|
52
79
|
(0, type_graphql_1.Directive)('@privilege(category: "transport", privilege: "query")'),
|
|
53
|
-
(0, type_graphql_1.Query)(returns =>
|
|
80
|
+
(0, type_graphql_1.Query)(returns => transport_driver_types_1.TransportDriverList),
|
|
54
81
|
__param(0, (0, type_graphql_1.Ctx)()),
|
|
55
82
|
__param(1, (0, type_graphql_1.Arg)('filters', type => [shell_1.Filter], { nullable: true })),
|
|
56
83
|
__param(2, (0, type_graphql_1.Arg)('pagination', type => shell_1.Pagination, { nullable: true })),
|
|
@@ -60,6 +87,19 @@ __decorate([
|
|
|
60
87
|
__metadata("design:returntype", Promise)
|
|
61
88
|
], TransportDriverQuery.prototype, "transportDrivers", null);
|
|
62
89
|
__decorate([
|
|
90
|
+
(0, type_graphql_1.Directive)('@transaction'),
|
|
91
|
+
(0, type_graphql_1.Directive)('@privilege(category: "transport", privilege: "query")'),
|
|
92
|
+
(0, type_graphql_1.Query)(returns => transport_driver_types_1.TransportDriverList),
|
|
93
|
+
__param(0, (0, type_graphql_1.Ctx)()),
|
|
94
|
+
__param(1, (0, type_graphql_1.Arg)('filters', type => [shell_1.Filter], { nullable: true })),
|
|
95
|
+
__param(2, (0, type_graphql_1.Arg)('pagination', type => shell_1.Pagination, { nullable: true })),
|
|
96
|
+
__param(3, (0, type_graphql_1.Arg)('sortings', type => [shell_1.Sorting], { nullable: true })),
|
|
97
|
+
__metadata("design:type", Function),
|
|
98
|
+
__metadata("design:paramtypes", [Object, Array, typeof (_b = typeof shell_1.Pagination !== "undefined" && shell_1.Pagination) === "function" ? _b : Object, Array]),
|
|
99
|
+
__metadata("design:returntype", Promise)
|
|
100
|
+
], TransportDriverQuery.prototype, "transportUserDrivers", null);
|
|
101
|
+
__decorate([
|
|
102
|
+
(0, type_graphql_1.Directive)('@transaction'),
|
|
63
103
|
(0, type_graphql_1.Directive)('@privilege(category: "transport", privilege: "query")'),
|
|
64
104
|
(0, type_graphql_1.Query)(returns => transport_driver_1.TransportDriver),
|
|
65
105
|
__param(0, (0, type_graphql_1.Arg)('driverCode')),
|
|
@@ -68,6 +108,41 @@ __decorate([
|
|
|
68
108
|
__metadata("design:paramtypes", [String, Object]),
|
|
69
109
|
__metadata("design:returntype", Promise)
|
|
70
110
|
], TransportDriverQuery.prototype, "transportDriver", null);
|
|
111
|
+
__decorate([
|
|
112
|
+
(0, type_graphql_1.FieldResolver)(),
|
|
113
|
+
__param(0, (0, type_graphql_1.Root)()),
|
|
114
|
+
__metadata("design:type", Function),
|
|
115
|
+
__metadata("design:paramtypes", [transport_driver_1.TransportDriver]),
|
|
116
|
+
__metadata("design:returntype", Promise)
|
|
117
|
+
], TransportDriverQuery.prototype, "domain", null);
|
|
118
|
+
__decorate([
|
|
119
|
+
(0, type_graphql_1.FieldResolver)(),
|
|
120
|
+
__param(0, (0, type_graphql_1.Root)()),
|
|
121
|
+
__metadata("design:type", Function),
|
|
122
|
+
__metadata("design:paramtypes", [transport_driver_1.TransportDriver]),
|
|
123
|
+
__metadata("design:returntype", Promise)
|
|
124
|
+
], TransportDriverQuery.prototype, "user", null);
|
|
125
|
+
__decorate([
|
|
126
|
+
(0, type_graphql_1.FieldResolver)(),
|
|
127
|
+
__param(0, (0, type_graphql_1.Root)()),
|
|
128
|
+
__metadata("design:type", Function),
|
|
129
|
+
__metadata("design:paramtypes", [transport_driver_1.TransportDriver]),
|
|
130
|
+
__metadata("design:returntype", Promise)
|
|
131
|
+
], TransportDriverQuery.prototype, "bizplace", null);
|
|
132
|
+
__decorate([
|
|
133
|
+
(0, type_graphql_1.FieldResolver)(),
|
|
134
|
+
__param(0, (0, type_graphql_1.Root)()),
|
|
135
|
+
__metadata("design:type", Function),
|
|
136
|
+
__metadata("design:paramtypes", [transport_driver_1.TransportDriver]),
|
|
137
|
+
__metadata("design:returntype", Promise)
|
|
138
|
+
], TransportDriverQuery.prototype, "updater", null);
|
|
139
|
+
__decorate([
|
|
140
|
+
(0, type_graphql_1.FieldResolver)(),
|
|
141
|
+
__param(0, (0, type_graphql_1.Root)()),
|
|
142
|
+
__metadata("design:type", Function),
|
|
143
|
+
__metadata("design:paramtypes", [transport_driver_1.TransportDriver]),
|
|
144
|
+
__metadata("design:returntype", Promise)
|
|
145
|
+
], TransportDriverQuery.prototype, "creator", null);
|
|
71
146
|
TransportDriverQuery = __decorate([
|
|
72
147
|
(0, type_graphql_1.Resolver)(transport_driver_1.TransportDriver)
|
|
73
148
|
], TransportDriverQuery);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport-driver-query.js","sourceRoot":"","sources":["../../../server/service/transport-driver/transport-driver-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"transport-driver-query.js","sourceRoot":"","sources":["../../../server/service/transport-driver/transport-driver-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,10 +36,34 @@ __decorate([
|
|
|
36
36
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
37
37
|
__metadata("design:type", String)
|
|
38
38
|
], NewTransportDriver.prototype, "description", void 0);
|
|
39
|
+
__decorate([
|
|
40
|
+
(0, type_graphql_1.Field)(),
|
|
41
|
+
__metadata("design:type", String)
|
|
42
|
+
], NewTransportDriver.prototype, "userId", void 0);
|
|
39
43
|
__decorate([
|
|
40
44
|
(0, type_graphql_1.Field)(),
|
|
41
45
|
__metadata("design:type", String)
|
|
42
46
|
], NewTransportDriver.prototype, "driverCode", void 0);
|
|
47
|
+
__decorate([
|
|
48
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
49
|
+
__metadata("design:type", String)
|
|
50
|
+
], NewTransportDriver.prototype, "driverTelNo", void 0);
|
|
51
|
+
__decorate([
|
|
52
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
53
|
+
__metadata("design:type", String)
|
|
54
|
+
], NewTransportDriver.prototype, "licenseType", void 0);
|
|
55
|
+
__decorate([
|
|
56
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
57
|
+
__metadata("design:type", String)
|
|
58
|
+
], NewTransportDriver.prototype, "licenseNo", void 0);
|
|
59
|
+
__decorate([
|
|
60
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
61
|
+
__metadata("design:type", String)
|
|
62
|
+
], NewTransportDriver.prototype, "licContDate", void 0);
|
|
63
|
+
__decorate([
|
|
64
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
65
|
+
__metadata("design:type", String)
|
|
66
|
+
], NewTransportDriver.prototype, "licExpiDate", void 0);
|
|
43
67
|
NewTransportDriver = __decorate([
|
|
44
68
|
(0, type_graphql_1.InputType)()
|
|
45
69
|
], NewTransportDriver);
|
|
@@ -62,6 +86,26 @@ __decorate([
|
|
|
62
86
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
63
87
|
__metadata("design:type", String)
|
|
64
88
|
], TransportDriverPatch.prototype, "driverCode", void 0);
|
|
89
|
+
__decorate([
|
|
90
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
91
|
+
__metadata("design:type", String)
|
|
92
|
+
], TransportDriverPatch.prototype, "driverTelNo", void 0);
|
|
93
|
+
__decorate([
|
|
94
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
95
|
+
__metadata("design:type", String)
|
|
96
|
+
], TransportDriverPatch.prototype, "licenseType", void 0);
|
|
97
|
+
__decorate([
|
|
98
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
99
|
+
__metadata("design:type", String)
|
|
100
|
+
], TransportDriverPatch.prototype, "licenseNo", void 0);
|
|
101
|
+
__decorate([
|
|
102
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
103
|
+
__metadata("design:type", String)
|
|
104
|
+
], TransportDriverPatch.prototype, "licContDate", void 0);
|
|
105
|
+
__decorate([
|
|
106
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
107
|
+
__metadata("design:type", String)
|
|
108
|
+
], TransportDriverPatch.prototype, "licExpiDate", void 0);
|
|
65
109
|
__decorate([
|
|
66
110
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
67
111
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport-driver-types.js","sourceRoot":"","sources":["../../../server/service/transport-driver/transport-driver-types.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAgE;
|
|
1
|
+
{"version":3,"file":"transport-driver-types.js","sourceRoot":"","sources":["../../../server/service/transport-driver/transport-driver-types.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAgE;AAEhE,yDAAoD;AAGpD,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;CAM/B,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,kCAAe,CAAC,CAAC;;kDACT;AAGxB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;kDACN;AALF,mBAAmB;IAD/B,IAAA,yBAAU,GAAE;GACA,mBAAmB,CAM/B;AANY,kDAAmB;AAShC,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;CA2B9B,CAAA;AAzBC;IADC,IAAA,oBAAK,GAAE;;gDACI;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGpB;IADC,IAAA,oBAAK,GAAE;;kDACM;AAGd;IADC,IAAA,oBAAK,GAAE;;sDACU;AAGlB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACR;AAGlB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AA1BT,kBAAkB;IAD9B,IAAA,wBAAS,GAAE;GACC,kBAAkB,CA2B9B;AA3BY,gDAAkB;AA8B/B,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;CA8BhC,CAAA;AA5BC;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACf;AAGX;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACP;AAGnB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACR;AAGlB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACX;AA7BJ,oBAAoB;IADhC,IAAA,wBAAS,GAAE;GACC,oBAAoB,CA8BhC;AA9BY,oDAAoB"}
|
|
@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var _a, _b, _c, _d;
|
|
11
|
+
var _a, _b, _c, _d, _e;
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.TransportDriver = void 0;
|
|
14
14
|
const type_graphql_1 = require("type-graphql");
|
|
@@ -16,6 +16,7 @@ const typeorm_1 = require("typeorm");
|
|
|
16
16
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
17
17
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
18
18
|
const shell_1 = require("@things-factory/shell");
|
|
19
|
+
const transport_vehicle_1 = require("../transport-vehicle/transport-vehicle");
|
|
19
20
|
let TransportDriver = class TransportDriver {
|
|
20
21
|
};
|
|
21
22
|
__decorate([
|
|
@@ -41,6 +42,15 @@ __decorate([
|
|
|
41
42
|
(0, typeorm_1.RelationId)((transportDriver) => transportDriver.bizplace),
|
|
42
43
|
__metadata("design:type", String)
|
|
43
44
|
], TransportDriver.prototype, "bizplaceId", void 0);
|
|
45
|
+
__decorate([
|
|
46
|
+
(0, typeorm_1.ManyToOne)(type => auth_base_1.User),
|
|
47
|
+
(0, type_graphql_1.Field)(type => auth_base_1.User),
|
|
48
|
+
__metadata("design:type", typeof (_c = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _c : Object)
|
|
49
|
+
], TransportDriver.prototype, "user", void 0);
|
|
50
|
+
__decorate([
|
|
51
|
+
(0, typeorm_1.RelationId)((transportDriver) => transportDriver.user),
|
|
52
|
+
__metadata("design:type", String)
|
|
53
|
+
], TransportDriver.prototype, "userId", void 0);
|
|
44
54
|
__decorate([
|
|
45
55
|
(0, typeorm_1.Column)(),
|
|
46
56
|
(0, type_graphql_1.Field)(),
|
|
@@ -51,6 +61,37 @@ __decorate([
|
|
|
51
61
|
(0, type_graphql_1.Field)(),
|
|
52
62
|
__metadata("design:type", String)
|
|
53
63
|
], TransportDriver.prototype, "driverCode", void 0);
|
|
64
|
+
__decorate([
|
|
65
|
+
(0, typeorm_1.ManyToMany)(type => transport_vehicle_1.TransportVehicle, transportVehicle => transportVehicle.transportDrivers),
|
|
66
|
+
(0, typeorm_1.JoinTable)({ name: 'drivers_vehicles' }),
|
|
67
|
+
(0, type_graphql_1.Field)(type => [transport_vehicle_1.TransportVehicle], { nullable: true }),
|
|
68
|
+
__metadata("design:type", Array)
|
|
69
|
+
], TransportDriver.prototype, "transportVehicles", void 0);
|
|
70
|
+
__decorate([
|
|
71
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
72
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
73
|
+
__metadata("design:type", String)
|
|
74
|
+
], TransportDriver.prototype, "driverTelNo", void 0);
|
|
75
|
+
__decorate([
|
|
76
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
77
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
78
|
+
__metadata("design:type", String)
|
|
79
|
+
], TransportDriver.prototype, "liceseType", void 0);
|
|
80
|
+
__decorate([
|
|
81
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
82
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
83
|
+
__metadata("design:type", String)
|
|
84
|
+
], TransportDriver.prototype, "licenseNo", void 0);
|
|
85
|
+
__decorate([
|
|
86
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
87
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
88
|
+
__metadata("design:type", String)
|
|
89
|
+
], TransportDriver.prototype, "licContDate", void 0);
|
|
90
|
+
__decorate([
|
|
91
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
92
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
93
|
+
__metadata("design:type", String)
|
|
94
|
+
], TransportDriver.prototype, "licExpiDate", void 0);
|
|
54
95
|
__decorate([
|
|
55
96
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
56
97
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
@@ -59,7 +100,7 @@ __decorate([
|
|
|
59
100
|
__decorate([
|
|
60
101
|
(0, typeorm_1.ManyToOne)(type => auth_base_1.User),
|
|
61
102
|
(0, type_graphql_1.Field)(type => auth_base_1.User, { nullable: true }),
|
|
62
|
-
__metadata("design:type", typeof (
|
|
103
|
+
__metadata("design:type", typeof (_d = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _d : Object)
|
|
63
104
|
], TransportDriver.prototype, "creator", void 0);
|
|
64
105
|
__decorate([
|
|
65
106
|
(0, typeorm_1.RelationId)((transportDriver) => transportDriver.creator),
|
|
@@ -68,7 +109,7 @@ __decorate([
|
|
|
68
109
|
__decorate([
|
|
69
110
|
(0, typeorm_1.ManyToOne)(type => auth_base_1.User),
|
|
70
111
|
(0, type_graphql_1.Field)(type => auth_base_1.User, { nullable: true }),
|
|
71
|
-
__metadata("design:type", typeof (
|
|
112
|
+
__metadata("design:type", typeof (_e = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _e : Object)
|
|
72
113
|
], TransportDriver.prototype, "updater", void 0);
|
|
73
114
|
__decorate([
|
|
74
115
|
(0, typeorm_1.RelationId)((transportDriver) => transportDriver.updater),
|
|
@@ -91,7 +132,7 @@ __decorate([
|
|
|
91
132
|
], TransportDriver.prototype, "deletedAt", void 0);
|
|
92
133
|
TransportDriver = __decorate([
|
|
93
134
|
(0, typeorm_1.Entity)(),
|
|
94
|
-
(0, typeorm_1.Index)('ix_transport-driver_0', (transportDriver) => [transportDriver.domain, transportDriver.driverCode, transportDriver.
|
|
135
|
+
(0, typeorm_1.Index)('ix_transport-driver_0', (transportDriver) => [transportDriver.domain, transportDriver.driverCode, transportDriver.id], {
|
|
95
136
|
unique: true
|
|
96
137
|
}),
|
|
97
138
|
(0, type_graphql_1.ObjectType)()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport-driver.js","sourceRoot":"","sources":["../../../server/service/transport-driver/transport-driver.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"transport-driver.js","sourceRoot":"","sources":["../../../server/service/transport-driver/transport-driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ exports.deleteTransportVehicles = exports.deleteTransportVehicle = exports.updat
|
|
|
16
16
|
const type_graphql_1 = require("type-graphql");
|
|
17
17
|
const typeorm_1 = require("typeorm");
|
|
18
18
|
const __1 = require("../");
|
|
19
|
+
const transport_driver_1 = require("../transport-driver/transport-driver");
|
|
19
20
|
const transport_vehicle_1 = require("./transport-vehicle");
|
|
20
21
|
const debug = require('debug')('things-factory:operato-wms:addTransportVehicle');
|
|
21
22
|
let TransportVehicleMutation = class TransportVehicleMutation {
|
|
@@ -55,6 +56,37 @@ let TransportVehicleMutation = class TransportVehicleMutation {
|
|
|
55
56
|
async deleteTransportVehicles(ids, context) {
|
|
56
57
|
return await deleteTransportVehicles(ids, context);
|
|
57
58
|
}
|
|
59
|
+
async addTransportVehicleDriver(id, driverId, context) {
|
|
60
|
+
const { domain, user, tx } = context.state;
|
|
61
|
+
const transportVehicleRepo = tx.getRepository(transport_vehicle_1.TransportVehicle);
|
|
62
|
+
const transportVehicle = await transportVehicleRepo.findOne({
|
|
63
|
+
where: { domain, id },
|
|
64
|
+
relations: ['domain', 'transportDrivers']
|
|
65
|
+
});
|
|
66
|
+
if (!transportVehicle)
|
|
67
|
+
throw new Error('Failed to find vehicle');
|
|
68
|
+
const existedDriverIds = transportVehicle.transportDrivers.map(transportDirver => transportDirver.id);
|
|
69
|
+
if (existedDriverIds.includes(driverId))
|
|
70
|
+
throw new Error('driver user already exists');
|
|
71
|
+
const newDriver = tx.getRepository(transport_driver_1.TransportDriver).findOne({ where: { id: driverId, domain } });
|
|
72
|
+
if (!newDriver)
|
|
73
|
+
throw new Error('driver not found');
|
|
74
|
+
existedDriverIds.push(driverId);
|
|
75
|
+
return await transportVehicleRepo.save(Object.assign(Object.assign({}, transportVehicle), { transportDrivers: await (0, typeorm_1.getRepository)(transport_driver_1.TransportDriver).findByIds(existedDriverIds), updater: user }));
|
|
76
|
+
}
|
|
77
|
+
async deleteTransportVehicleDrivers(vehicleId, ids, context) {
|
|
78
|
+
const { domain, user, tx } = context.state;
|
|
79
|
+
const transportVehicleRepo = tx.getRepository(transport_vehicle_1.TransportVehicle);
|
|
80
|
+
const transportVehicle = await transportVehicleRepo.findOne({
|
|
81
|
+
where: { domain, id: vehicleId },
|
|
82
|
+
relations: ['domain', 'transportDrivers']
|
|
83
|
+
});
|
|
84
|
+
if (!transportVehicle)
|
|
85
|
+
throw new Error('Failed to find vehicle');
|
|
86
|
+
const existedDriverIds = transportVehicle.transportDrivers.map(transportDriver => transportDriver.id);
|
|
87
|
+
const newDriverIds = existedDriverIds.filter(existedDriverId => !ids.includes(existedDriverId));
|
|
88
|
+
return await transportVehicleRepo.save(Object.assign(Object.assign({}, transportVehicle), { transportDrivers: await (0, typeorm_1.getRepository)(transport_driver_1.TransportDriver).findByIds(newDriverIds), updater: user }));
|
|
89
|
+
}
|
|
58
90
|
};
|
|
59
91
|
__decorate([
|
|
60
92
|
(0, type_graphql_1.Directive)('@transaction'),
|
|
@@ -106,6 +138,28 @@ __decorate([
|
|
|
106
138
|
__metadata("design:paramtypes", [Array, Object]),
|
|
107
139
|
__metadata("design:returntype", Promise)
|
|
108
140
|
], TransportVehicleMutation.prototype, "deleteTransportVehicles", null);
|
|
141
|
+
__decorate([
|
|
142
|
+
(0, type_graphql_1.Directive)('@transaction'),
|
|
143
|
+
(0, type_graphql_1.Directive)('@privilege(category: "transport", privilege: "mutation")'),
|
|
144
|
+
(0, type_graphql_1.Mutation)(returns => transport_vehicle_1.TransportVehicle),
|
|
145
|
+
__param(0, (0, type_graphql_1.Arg)('id')),
|
|
146
|
+
__param(1, (0, type_graphql_1.Arg)('driverId', type => String)),
|
|
147
|
+
__param(2, (0, type_graphql_1.Ctx)()),
|
|
148
|
+
__metadata("design:type", Function),
|
|
149
|
+
__metadata("design:paramtypes", [String, String, Object]),
|
|
150
|
+
__metadata("design:returntype", Promise)
|
|
151
|
+
], TransportVehicleMutation.prototype, "addTransportVehicleDriver", null);
|
|
152
|
+
__decorate([
|
|
153
|
+
(0, type_graphql_1.Directive)('@transaction'),
|
|
154
|
+
(0, type_graphql_1.Directive)('@privilege(category: "transport", privilege: "mutation")'),
|
|
155
|
+
(0, type_graphql_1.Mutation)(returns => transport_vehicle_1.TransportVehicle),
|
|
156
|
+
__param(0, (0, type_graphql_1.Arg)('vehicleId')),
|
|
157
|
+
__param(1, (0, type_graphql_1.Arg)('ids', type => [String])),
|
|
158
|
+
__param(2, (0, type_graphql_1.Ctx)()),
|
|
159
|
+
__metadata("design:type", Function),
|
|
160
|
+
__metadata("design:paramtypes", [String, Array, Object]),
|
|
161
|
+
__metadata("design:returntype", Promise)
|
|
162
|
+
], TransportVehicleMutation.prototype, "deleteTransportVehicleDrivers", null);
|
|
109
163
|
TransportVehicleMutation = __decorate([
|
|
110
164
|
(0, type_graphql_1.Resolver)(transport_vehicle_1.TransportVehicle)
|
|
111
165
|
], TransportVehicleMutation);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport-vehicle-mutation.js","sourceRoot":"","sources":["../../../server/service/transport-vehicle/transport-vehicle-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"transport-vehicle-mutation.js","sourceRoot":"","sources":["../../../server/service/transport-vehicle/transport-vehicle-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,6 +54,17 @@ let TransportVehicleQuery = class TransportVehicleQuery {
|
|
|
54
54
|
relations: ['domain', 'bizplace', 'creator', 'updater']
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
|
+
async transportVehicleAndDrivers(id, context) {
|
|
58
|
+
const { domain, user, tx } = context.state;
|
|
59
|
+
return await tx.getRepository(transport_vehicle_1.TransportVehicle).findOne({
|
|
60
|
+
where: {
|
|
61
|
+
id,
|
|
62
|
+
domain,
|
|
63
|
+
deletedAt: (0, typeorm_1.IsNull)()
|
|
64
|
+
},
|
|
65
|
+
relations: ['domain', 'bizplace', 'creator', 'updater', 'transportDrivers']
|
|
66
|
+
});
|
|
67
|
+
}
|
|
57
68
|
};
|
|
58
69
|
__decorate([
|
|
59
70
|
(0, type_graphql_1.Directive)('@transaction'),
|
|
@@ -76,6 +87,16 @@ __decorate([
|
|
|
76
87
|
__metadata("design:paramtypes", [String, Object]),
|
|
77
88
|
__metadata("design:returntype", Promise)
|
|
78
89
|
], TransportVehicleQuery.prototype, "transportVehicle", null);
|
|
90
|
+
__decorate([
|
|
91
|
+
(0, type_graphql_1.Directive)('@transaction'),
|
|
92
|
+
(0, type_graphql_1.Directive)('@privilege(category: "transport", privilege: "query")'),
|
|
93
|
+
(0, type_graphql_1.Query)(returns => transport_vehicle_1.TransportVehicle),
|
|
94
|
+
__param(0, (0, type_graphql_1.Arg)('id')),
|
|
95
|
+
__param(1, (0, type_graphql_1.Ctx)()),
|
|
96
|
+
__metadata("design:type", Function),
|
|
97
|
+
__metadata("design:paramtypes", [String, Object]),
|
|
98
|
+
__metadata("design:returntype", Promise)
|
|
99
|
+
], TransportVehicleQuery.prototype, "transportVehicleAndDrivers", null);
|
|
79
100
|
TransportVehicleQuery = __decorate([
|
|
80
101
|
(0, type_graphql_1.Resolver)(transport_vehicle_1.TransportVehicle)
|
|
81
102
|
], TransportVehicleQuery);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport-vehicle-query.js","sourceRoot":"","sources":["../../../server/service/transport-vehicle/transport-vehicle-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAAmE;AACnE,qCAAmD;AAGnD,uDAAkE;AAClE,iDAAuF;AAEvF,2BAA0C;AAC1C,2DAAsD;AAGtD,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAIhC,KAAK,CAAC,iBAAiB,CACd,OAAY,EACmC,OAAkB,EACb,UAAuB,EAC1B,QAAoB;QAE5E,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAC5E,IAAA,kBAAU,EAAC,YAAY,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAA;QAEpE,YAAY;aACT,iBAAiB,CAAC,yBAAyB,EAAE,QAAQ,CAAC;aACtD,iBAAiB,CAAC,0BAA0B,EAAE,SAAS,CAAC;aACxD,iBAAiB,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAA;QAE3D,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,IAAG,CAAC,EAAE;YACvB,YAAY;iBACT,QAAQ,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;iBAC1D,QAAQ,CAAC,oCAAoC,CAAC,CAAA;SAClD;aAAM;YACL,YAAY;iBACT,KAAK,CAAC,oCAAoC,CAAC;iBAC3C,QAAQ,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;SAC9D;QAED,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;IAID,KAAK,CAAC,gBAAgB,CAAoB,UAAkB,EAAS,OAAY;QAC/E,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAC,OAAO,CAAC;YACtD,KAAK,EAAE;gBACL,MAAM;gBACN,UAAU;gBACV,QAAQ,EAAE,IAAA,YAAE,EAAC,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzD,SAAS,EAAE,IAAA,gBAAM,GAAE;aACpB;YACD,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC;SACxD,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"transport-vehicle-query.js","sourceRoot":"","sources":["../../../server/service/transport-vehicle/transport-vehicle-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ const typeorm_1 = require("typeorm");
|
|
|
16
16
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
17
17
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
18
18
|
const shell_1 = require("@things-factory/shell");
|
|
19
|
+
const transport_driver_1 = require("../transport-driver/transport-driver");
|
|
19
20
|
let TransportVehicle = class TransportVehicle {
|
|
20
21
|
};
|
|
21
22
|
__decorate([
|
|
@@ -46,6 +47,11 @@ __decorate([
|
|
|
46
47
|
(0, type_graphql_1.Field)(),
|
|
47
48
|
__metadata("design:type", String)
|
|
48
49
|
], TransportVehicle.prototype, "name", void 0);
|
|
50
|
+
__decorate([
|
|
51
|
+
(0, typeorm_1.ManyToMany)(type => transport_driver_1.TransportDriver, transportDriver => transportDriver.transportVehicles),
|
|
52
|
+
(0, type_graphql_1.Field)(type => [transport_driver_1.TransportDriver], { nullable: true }),
|
|
53
|
+
__metadata("design:type", Array)
|
|
54
|
+
], TransportVehicle.prototype, "transportDrivers", void 0);
|
|
49
55
|
__decorate([
|
|
50
56
|
(0, typeorm_1.Column)(),
|
|
51
57
|
(0, type_graphql_1.Field)(),
|
|
@@ -66,6 +72,26 @@ __decorate([
|
|
|
66
72
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
67
73
|
__metadata("design:type", String)
|
|
68
74
|
], TransportVehicle.prototype, "description", void 0);
|
|
75
|
+
__decorate([
|
|
76
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
77
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
78
|
+
__metadata("design:type", String)
|
|
79
|
+
], TransportVehicle.prototype, "ownerType", void 0);
|
|
80
|
+
__decorate([
|
|
81
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
82
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
83
|
+
__metadata("design:type", Date)
|
|
84
|
+
], TransportVehicle.prototype, "serviceStartDate", void 0);
|
|
85
|
+
__decorate([
|
|
86
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
87
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
88
|
+
__metadata("design:type", Date)
|
|
89
|
+
], TransportVehicle.prototype, "serviceEndDate", void 0);
|
|
90
|
+
__decorate([
|
|
91
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
92
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
93
|
+
__metadata("design:type", Boolean)
|
|
94
|
+
], TransportVehicle.prototype, "isEnabled", void 0);
|
|
69
95
|
__decorate([
|
|
70
96
|
(0, typeorm_1.ManyToOne)(type => auth_base_1.User),
|
|
71
97
|
(0, type_graphql_1.Field)(type => auth_base_1.User, { nullable: true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport-vehicle.js","sourceRoot":"","sources":["../../../server/service/transport-vehicle/transport-vehicle.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"transport-vehicle.js","sourceRoot":"","sources":["../../../server/service/transport-vehicle/transport-vehicle.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/transport-base",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.2.0",
|
|
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/biz-base": "^4.1.
|
|
27
|
+
"@things-factory/biz-base": "^4.1.40"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "ea20ff47ca0caa48313ae9d7c527e866f7eb1571"
|
|
30
30
|
}
|
|
@@ -67,7 +67,7 @@ export class TransportDriverMutation {
|
|
|
67
67
|
if (_createRecords.length > 0) {
|
|
68
68
|
for (let i = 0; i < _createRecords.length; i++) {
|
|
69
69
|
const patch: TransportDriverPatch = _createRecords[i]
|
|
70
|
-
const result = await createTransportDriver(patch, domain, user, tx)
|
|
70
|
+
const result = await createTransportDriver(patch as NewTransportDriver, domain, user, tx)
|
|
71
71
|
results.push({ ...result, cuFlag: '+' })
|
|
72
72
|
}
|
|
73
73
|
}
|
|
@@ -85,7 +85,7 @@ export class TransportDriverMutation {
|
|
|
85
85
|
}
|
|
86
86
|
|
|
87
87
|
export async function createTransportDriver(
|
|
88
|
-
transportDriver:
|
|
88
|
+
transportDriver: NewTransportDriver,
|
|
89
89
|
domain: Domain,
|
|
90
90
|
user: User,
|
|
91
91
|
tx?: EntityManager
|
|
@@ -93,8 +93,17 @@ export async function createTransportDriver(
|
|
|
93
93
|
const repository: Repository<TransportDriver> = tx
|
|
94
94
|
? tx.getRepository(TransportDriver)
|
|
95
95
|
: getRepository(TransportDriver)
|
|
96
|
+
|
|
97
|
+
const existingUsers: string[] = (await tx.getRepository(TransportDriver).find({ relations: ['user'] })).map(
|
|
98
|
+
driver => driver.userId
|
|
99
|
+
)
|
|
100
|
+
if (existingUsers.includes(transportDriver.userId)) throw new Error('driver user already exists')
|
|
101
|
+
|
|
102
|
+
const driverUser = await tx.getRepository(User).findOne({ where: { id: transportDriver.userId } })
|
|
103
|
+
|
|
96
104
|
return await repository.save({
|
|
97
105
|
...transportDriver,
|
|
106
|
+
user: driverUser,
|
|
98
107
|
domain,
|
|
99
108
|
creator: user,
|
|
100
109
|
updater: user
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import { Arg, Ctx, Directive, Query, Resolver } from 'type-graphql'
|
|
2
|
-
import { EntityManager, IsNull } from 'typeorm'
|
|
1
|
+
import { Arg, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
|
|
2
|
+
import { EntityManager, getRepository, IsNull } from 'typeorm'
|
|
3
3
|
|
|
4
|
-
import {
|
|
4
|
+
import { User } from '@things-factory/auth-base'
|
|
5
|
+
import { Bizplace } from '@things-factory/biz-base'
|
|
6
|
+
import { buildQuery, convertListParams, Domain, Filter, Pagination, Sorting } from '@things-factory/shell'
|
|
5
7
|
|
|
6
|
-
import { TransportDriverList } from '../'
|
|
7
8
|
import { TransportDriver } from './transport-driver'
|
|
9
|
+
import { TransportDriverList } from './transport-driver-types'
|
|
8
10
|
|
|
9
11
|
@Resolver(TransportDriver)
|
|
10
12
|
export class TransportDriverQuery {
|
|
@@ -40,6 +42,32 @@ export class TransportDriverQuery {
|
|
|
40
42
|
return { items, total }
|
|
41
43
|
}
|
|
42
44
|
|
|
45
|
+
@Directive('@transaction')
|
|
46
|
+
@Directive('@privilege(category: "transport", privilege: "query")')
|
|
47
|
+
@Query(returns => TransportDriverList)
|
|
48
|
+
async transportUserDrivers(
|
|
49
|
+
@Ctx() context: any,
|
|
50
|
+
@Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[],
|
|
51
|
+
@Arg('pagination', type => Pagination, { nullable: true }) pagination?: Pagination,
|
|
52
|
+
@Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[]
|
|
53
|
+
): Promise<TransportDriverList> {
|
|
54
|
+
const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
|
|
55
|
+
|
|
56
|
+
const convertedParams = convertListParams({
|
|
57
|
+
filters,
|
|
58
|
+
pagination,
|
|
59
|
+
sortings
|
|
60
|
+
})
|
|
61
|
+
|
|
62
|
+
const [items, total] = await tx.getRepository(TransportDriver).findAndCount({
|
|
63
|
+
...convertedParams,
|
|
64
|
+
relations: ['domain', 'user', 'creator', 'updater']
|
|
65
|
+
})
|
|
66
|
+
|
|
67
|
+
return { items, total }
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
@Directive('@transaction')
|
|
43
71
|
@Directive('@privilege(category: "transport", privilege: "query")')
|
|
44
72
|
@Query(returns => TransportDriver)
|
|
45
73
|
async transportDriver(@Arg('driverCode') driverCode: string, @Ctx() context: any): Promise<TransportDriver> {
|
|
@@ -47,7 +75,32 @@ export class TransportDriverQuery {
|
|
|
47
75
|
|
|
48
76
|
return await tx.getRepository(TransportDriver).findOne({
|
|
49
77
|
where: { domain, driverCode, deletedAt: IsNull() },
|
|
50
|
-
relations: ['domain', 'bizplace', 'creator', 'updater']
|
|
78
|
+
relations: ['domain', 'bizplace', 'creator', 'updater', 'transportVehicles']
|
|
51
79
|
})
|
|
52
80
|
}
|
|
81
|
+
|
|
82
|
+
@FieldResolver()
|
|
83
|
+
async domain(@Root() transportDriver: TransportDriver) {
|
|
84
|
+
return await getRepository(Domain).findOne(transportDriver.domainId)
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
@FieldResolver()
|
|
88
|
+
async user(@Root() transportDriver: TransportDriver) {
|
|
89
|
+
return await getRepository(User).findOne(transportDriver.userId)
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
@FieldResolver()
|
|
93
|
+
async bizplace(@Root() transportDriver: TransportDriver) {
|
|
94
|
+
return await getRepository(Bizplace).findOne(transportDriver.bizplaceId)
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
@FieldResolver()
|
|
98
|
+
async updater(@Root() transportDriver: TransportDriver) {
|
|
99
|
+
return await getRepository(User).findOne(transportDriver.updaterId)
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
@FieldResolver()
|
|
103
|
+
async creator(@Root() transportDriver: TransportDriver) {
|
|
104
|
+
return await getRepository(User).findOne(transportDriver.creatorId)
|
|
105
|
+
}
|
|
53
106
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Field, InputType, Int, ObjectType } from 'type-graphql'
|
|
2
|
+
|
|
2
3
|
import { TransportDriver } from './transport-driver'
|
|
3
4
|
|
|
4
5
|
@ObjectType()
|
|
@@ -16,26 +17,59 @@ export class NewTransportDriver {
|
|
|
16
17
|
name: string
|
|
17
18
|
|
|
18
19
|
@Field({ nullable: true })
|
|
19
|
-
description
|
|
20
|
+
description?: string
|
|
21
|
+
|
|
22
|
+
@Field()
|
|
23
|
+
userId: string
|
|
20
24
|
|
|
21
25
|
@Field()
|
|
22
26
|
driverCode: string
|
|
27
|
+
|
|
28
|
+
@Field({ nullable: true })
|
|
29
|
+
driverTelNo?: string
|
|
30
|
+
|
|
31
|
+
@Field({ nullable: true })
|
|
32
|
+
licenseType?: string
|
|
33
|
+
|
|
34
|
+
@Field({ nullable: true })
|
|
35
|
+
licenseNo?: string
|
|
36
|
+
|
|
37
|
+
@Field({ nullable: true })
|
|
38
|
+
licContDate?: string
|
|
39
|
+
|
|
40
|
+
@Field({ nullable: true })
|
|
41
|
+
licExpiDate?: string
|
|
23
42
|
}
|
|
24
43
|
|
|
25
44
|
@InputType()
|
|
26
45
|
export class TransportDriverPatch {
|
|
27
46
|
@Field({ nullable: true })
|
|
28
|
-
id
|
|
47
|
+
id?: string
|
|
29
48
|
|
|
30
49
|
@Field({ nullable: true })
|
|
31
|
-
name
|
|
50
|
+
name?: string
|
|
32
51
|
|
|
33
52
|
@Field({ nullable: true })
|
|
34
|
-
description
|
|
53
|
+
description?: string
|
|
35
54
|
|
|
36
55
|
@Field({ nullable: true })
|
|
37
|
-
driverCode
|
|
56
|
+
driverCode?: string
|
|
57
|
+
|
|
58
|
+
@Field({ nullable: true })
|
|
59
|
+
driverTelNo?: string
|
|
60
|
+
|
|
61
|
+
@Field({ nullable: true })
|
|
62
|
+
licenseType?: string
|
|
63
|
+
|
|
64
|
+
@Field({ nullable: true })
|
|
65
|
+
licenseNo?: string
|
|
66
|
+
|
|
67
|
+
@Field({ nullable: true })
|
|
68
|
+
licContDate?: string
|
|
69
|
+
|
|
70
|
+
@Field({ nullable: true })
|
|
71
|
+
licExpiDate?: string
|
|
38
72
|
|
|
39
73
|
@Field({ nullable: true })
|
|
40
|
-
cuFlag
|
|
74
|
+
cuFlag?: string
|
|
41
75
|
}
|
|
@@ -4,6 +4,8 @@ import {
|
|
|
4
4
|
CreateDateColumn,
|
|
5
5
|
Entity,
|
|
6
6
|
Index,
|
|
7
|
+
JoinTable,
|
|
8
|
+
ManyToMany,
|
|
7
9
|
ManyToOne,
|
|
8
10
|
PrimaryGeneratedColumn,
|
|
9
11
|
RelationId,
|
|
@@ -14,10 +16,12 @@ import { User } from '@things-factory/auth-base'
|
|
|
14
16
|
import { Bizplace } from '@things-factory/biz-base'
|
|
15
17
|
import { Domain } from '@things-factory/shell'
|
|
16
18
|
|
|
19
|
+
import { TransportVehicle } from '../transport-vehicle/transport-vehicle'
|
|
20
|
+
|
|
17
21
|
@Entity()
|
|
18
22
|
@Index(
|
|
19
23
|
'ix_transport-driver_0',
|
|
20
|
-
(transportDriver: TransportDriver) => [transportDriver.domain, transportDriver.driverCode, transportDriver.
|
|
24
|
+
(transportDriver: TransportDriver) => [transportDriver.domain, transportDriver.driverCode, transportDriver.id],
|
|
21
25
|
{
|
|
22
26
|
unique: true
|
|
23
27
|
}
|
|
@@ -42,6 +46,13 @@ export class TransportDriver {
|
|
|
42
46
|
@RelationId((transportDriver: TransportDriver) => transportDriver.bizplace)
|
|
43
47
|
bizplaceId?: string
|
|
44
48
|
|
|
49
|
+
@ManyToOne(type => User)
|
|
50
|
+
@Field(type => User)
|
|
51
|
+
user: User
|
|
52
|
+
|
|
53
|
+
@RelationId((transportDriver: TransportDriver) => transportDriver.user)
|
|
54
|
+
userId: string
|
|
55
|
+
|
|
45
56
|
@Column()
|
|
46
57
|
@Field()
|
|
47
58
|
name: string
|
|
@@ -50,6 +61,31 @@ export class TransportDriver {
|
|
|
50
61
|
@Field()
|
|
51
62
|
driverCode: string
|
|
52
63
|
|
|
64
|
+
@ManyToMany(type => TransportVehicle, transportVehicle => transportVehicle.transportDrivers)
|
|
65
|
+
@JoinTable({ name: 'drivers_vehicles' })
|
|
66
|
+
@Field(type => [TransportVehicle], { nullable: true })
|
|
67
|
+
transportVehicles: TransportVehicle[]
|
|
68
|
+
|
|
69
|
+
@Column({ nullable: true })
|
|
70
|
+
@Field({ nullable: true })
|
|
71
|
+
driverTelNo: string
|
|
72
|
+
|
|
73
|
+
@Column({ nullable: true })
|
|
74
|
+
@Field({ nullable: true })
|
|
75
|
+
liceseType: string
|
|
76
|
+
|
|
77
|
+
@Column({ nullable: true })
|
|
78
|
+
@Field({ nullable: true })
|
|
79
|
+
licenseNo: string
|
|
80
|
+
|
|
81
|
+
@Column({ nullable: true })
|
|
82
|
+
@Field({ nullable: true })
|
|
83
|
+
licContDate: string
|
|
84
|
+
|
|
85
|
+
@Column({ nullable: true })
|
|
86
|
+
@Field({ nullable: true })
|
|
87
|
+
licExpiDate: string
|
|
88
|
+
|
|
53
89
|
@Column({ nullable: true })
|
|
54
90
|
@Field({ nullable: true })
|
|
55
91
|
description: string
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import { User } from '@things-factory/auth-base'
|
|
2
|
-
import { Domain } from '@things-factory/shell'
|
|
3
1
|
import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
|
|
4
2
|
import { EntityManager, getRepository, In, Repository } from 'typeorm'
|
|
3
|
+
|
|
4
|
+
import { User } from '@things-factory/auth-base'
|
|
5
|
+
import { Domain } from '@things-factory/shell'
|
|
6
|
+
|
|
5
7
|
import { NewTransportVehicle, TransportVehiclePatch } from '../'
|
|
8
|
+
import { TransportDriver } from '../transport-driver/transport-driver'
|
|
6
9
|
import { TransportVehicle } from './transport-vehicle'
|
|
7
10
|
|
|
8
11
|
const debug = require('debug')('things-factory:operato-wms:addTransportVehicle')
|
|
@@ -80,6 +83,65 @@ export class TransportVehicleMutation {
|
|
|
80
83
|
async deleteTransportVehicles(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<boolean> {
|
|
81
84
|
return await deleteTransportVehicles(ids, context)
|
|
82
85
|
}
|
|
86
|
+
|
|
87
|
+
@Directive('@transaction')
|
|
88
|
+
@Directive('@privilege(category: "transport", privilege: "mutation")')
|
|
89
|
+
@Mutation(returns => TransportVehicle)
|
|
90
|
+
async addTransportVehicleDriver(
|
|
91
|
+
@Arg('id') id: string,
|
|
92
|
+
@Arg('driverId', type => String) driverId: string,
|
|
93
|
+
@Ctx() context: any
|
|
94
|
+
): Promise<TransportVehicle> {
|
|
95
|
+
const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
|
|
96
|
+
const transportVehicleRepo = tx.getRepository(TransportVehicle)
|
|
97
|
+
const transportVehicle = await transportVehicleRepo.findOne({
|
|
98
|
+
where: { domain, id },
|
|
99
|
+
relations: ['domain', 'transportDrivers']
|
|
100
|
+
})
|
|
101
|
+
|
|
102
|
+
if (!transportVehicle) throw new Error('Failed to find vehicle')
|
|
103
|
+
|
|
104
|
+
const existedDriverIds: string[] = transportVehicle.transportDrivers.map(transportDirver => transportDirver.id)
|
|
105
|
+
if (existedDriverIds.includes(driverId)) throw new Error('driver user already exists')
|
|
106
|
+
|
|
107
|
+
const newDriver = tx.getRepository(TransportDriver).findOne({ where: { id: driverId, domain } })
|
|
108
|
+
if (!newDriver) throw new Error('driver not found')
|
|
109
|
+
|
|
110
|
+
existedDriverIds.push(driverId)
|
|
111
|
+
|
|
112
|
+
return await transportVehicleRepo.save({
|
|
113
|
+
...transportVehicle,
|
|
114
|
+
transportDrivers: await getRepository(TransportDriver).findByIds(existedDriverIds),
|
|
115
|
+
updater: user
|
|
116
|
+
})
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
@Directive('@transaction')
|
|
120
|
+
@Directive('@privilege(category: "transport", privilege: "mutation")')
|
|
121
|
+
@Mutation(returns => TransportVehicle)
|
|
122
|
+
async deleteTransportVehicleDrivers(
|
|
123
|
+
@Arg('vehicleId') vehicleId: string,
|
|
124
|
+
@Arg('ids', type => [String]) ids: string[],
|
|
125
|
+
@Ctx() context: any
|
|
126
|
+
): Promise<TransportVehicle> {
|
|
127
|
+
const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
|
|
128
|
+
const transportVehicleRepo = tx.getRepository(TransportVehicle)
|
|
129
|
+
const transportVehicle = await transportVehicleRepo.findOne({
|
|
130
|
+
where: { domain, id: vehicleId },
|
|
131
|
+
relations: ['domain', 'transportDrivers']
|
|
132
|
+
})
|
|
133
|
+
|
|
134
|
+
if (!transportVehicle) throw new Error('Failed to find vehicle')
|
|
135
|
+
|
|
136
|
+
const existedDriverIds: string[] = transportVehicle.transportDrivers.map(transportDriver => transportDriver.id)
|
|
137
|
+
const newDriverIds: string[] = existedDriverIds.filter(existedDriverId => !ids.includes(existedDriverId))
|
|
138
|
+
|
|
139
|
+
return await transportVehicleRepo.save({
|
|
140
|
+
...transportVehicle,
|
|
141
|
+
transportDrivers: await getRepository(TransportDriver).findByIds(newDriverIds),
|
|
142
|
+
updater: user
|
|
143
|
+
})
|
|
144
|
+
}
|
|
83
145
|
}
|
|
84
146
|
|
|
85
147
|
export async function createTransportVehicle(
|
|
@@ -59,4 +59,20 @@ export class TransportVehicleQuery {
|
|
|
59
59
|
relations: ['domain', 'bizplace', 'creator', 'updater']
|
|
60
60
|
})
|
|
61
61
|
}
|
|
62
|
+
|
|
63
|
+
@Directive('@transaction')
|
|
64
|
+
@Directive('@privilege(category: "transport", privilege: "query")')
|
|
65
|
+
@Query(returns => TransportVehicle)
|
|
66
|
+
async transportVehicleAndDrivers(@Arg('id') id: string, @Ctx() context: any): Promise<TransportVehicle> {
|
|
67
|
+
const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
|
|
68
|
+
|
|
69
|
+
return await tx.getRepository(TransportVehicle).findOne({
|
|
70
|
+
where: {
|
|
71
|
+
id,
|
|
72
|
+
domain,
|
|
73
|
+
deletedAt: IsNull()
|
|
74
|
+
},
|
|
75
|
+
relations: ['domain', 'bizplace', 'creator', 'updater', 'transportDrivers']
|
|
76
|
+
})
|
|
77
|
+
}
|
|
62
78
|
}
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
CreateDateColumn,
|
|
5
5
|
Entity,
|
|
6
6
|
Index,
|
|
7
|
+
ManyToMany,
|
|
7
8
|
ManyToOne,
|
|
8
9
|
PrimaryGeneratedColumn,
|
|
9
10
|
RelationId,
|
|
@@ -14,6 +15,8 @@ import { User } from '@things-factory/auth-base'
|
|
|
14
15
|
import { Bizplace } from '@things-factory/biz-base'
|
|
15
16
|
import { Domain } from '@things-factory/shell'
|
|
16
17
|
|
|
18
|
+
import { TransportDriver } from '../transport-driver/transport-driver'
|
|
19
|
+
|
|
17
20
|
@Entity()
|
|
18
21
|
@Index(
|
|
19
22
|
'ix_transport-vehicle_0',
|
|
@@ -44,6 +47,10 @@ export class TransportVehicle {
|
|
|
44
47
|
@Field()
|
|
45
48
|
name: string
|
|
46
49
|
|
|
50
|
+
@ManyToMany(type => TransportDriver, transportDriver => transportDriver.transportVehicles)
|
|
51
|
+
@Field(type => [TransportDriver], { nullable: true })
|
|
52
|
+
transportDrivers: TransportDriver[]
|
|
53
|
+
|
|
47
54
|
@Column()
|
|
48
55
|
@Field()
|
|
49
56
|
regNumber: string
|
|
@@ -60,6 +67,22 @@ export class TransportVehicle {
|
|
|
60
67
|
@Field({ nullable: true })
|
|
61
68
|
description: string
|
|
62
69
|
|
|
70
|
+
@Column({ nullable: true })
|
|
71
|
+
@Field({ nullable: true })
|
|
72
|
+
ownerType: string
|
|
73
|
+
|
|
74
|
+
@Column({ nullable: true })
|
|
75
|
+
@Field({ nullable: true })
|
|
76
|
+
serviceStartDate: Date
|
|
77
|
+
|
|
78
|
+
@Column({ nullable: true })
|
|
79
|
+
@Field({ nullable: true })
|
|
80
|
+
serviceEndDate: Date
|
|
81
|
+
|
|
82
|
+
@Column({ nullable: true })
|
|
83
|
+
@Field({ nullable: true })
|
|
84
|
+
isEnabled: boolean
|
|
85
|
+
|
|
63
86
|
@ManyToOne(type => User)
|
|
64
87
|
@Field(type => User, { nullable: true })
|
|
65
88
|
creator: User
|