@things-factory/integration-lmd 4.3.332 → 4.3.342

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist-server/controllers/lmd-middleware/apis/create-parcel.js +2 -1
  2. package/dist-server/controllers/lmd-middleware/apis/create-parcel.js.map +1 -1
  3. package/dist-server/service/last-mile-delivery/last-mile-delivery-query.js +22 -2
  4. package/dist-server/service/last-mile-delivery/last-mile-delivery-query.js.map +1 -1
  5. package/package.json +2 -2
  6. package/server/controllers/lmd-middleware/apis/create-parcel.ts +2 -1
  7. package/server/service/last-mile-delivery/last-mile-delivery-query.ts +39 -7
package/dist-server/controllers/lmd-middleware/apis/create-parcel.js CHANGED
@@ -56,7 +56,8 @@ function createParcel() {
56
56
  var _a, _b;
57
57
  return {
58
58
  parcelId: (_a = parcel === null || parcel === void 0 ? void 0 : parcel.data) === null || _a === void 0 ? void 0 : _a.parcel_id,
59
- refNo: (_b = parcel === null || parcel === void 0 ? void 0 : parcel.data) === null || _b === void 0 ? void 0 : _b.ref_no
59
+ refNo: (_b = parcel === null || parcel === void 0 ? void 0 : parcel.data) === null || _b === void 0 ? void 0 : _b.ref_no,
60
+ transporter: parcel === null || parcel === void 0 ? void 0 : parcel.courier
60
61
  };
61
62
  });
62
63
  }
package/dist-server/controllers/lmd-middleware/apis/create-parcel.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"create-parcel.js","sourceRoot":"","sources":["../../../../server/controllers/lmd-middleware/apis/create-parcel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"create-parcel.js","sourceRoot":"","sources":["../../../../server/controllers/lmd-middleware/apis/create-parcel.ts"],"names":[],"mappings":"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"}
package/dist-server/service/last-mile-delivery/last-mile-delivery-query.js CHANGED
@@ -16,15 +16,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
16
16
  exports.LastMileDeliveryQuery = void 0;
17
17
  const type_graphql_1 = require("type-graphql");
18
18
  const typeorm_1 = require("typeorm");
19
- const shell_1 = require("@things-factory/shell");
20
19
  const auth_base_1 = require("@things-factory/auth-base");
20
+ const shell_1 = require("@things-factory/shell");
21
21
  const last_mile_delivery_1 = require("./last-mile-delivery");
22
22
  const last_mile_delivery_type_1 = require("./last-mile-delivery-type");
23
23
  let LastMileDeliveryQuery = class LastMileDeliveryQuery {
24
24
  async lastMileDelivery(id, context) {
25
25
  const { domain, user, tx } = context.state;
26
26
  const result = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
27
- where: { id }, relations: ['lastMileDeliverySettings', 'lastMileDeliverySettings.geoCountry', 'lastMileDeliveryBizplaces', 'lastMileDeliveryBizplaces.bizplace']
27
+ where: { id },
28
+ relations: [
29
+ 'lastMileDeliverySettings',
30
+ 'lastMileDeliverySettings.geoCountry',
31
+ 'lastMileDeliveryBizplaces',
32
+ 'lastMileDeliveryBizplaces.bizplace'
33
+ ]
28
34
  });
29
35
  return result;
30
36
  }
@@ -34,6 +40,13 @@ let LastMileDeliveryQuery = class LastMileDeliveryQuery {
34
40
  const [items, total] = await (0, typeorm_1.getRepository)(last_mile_delivery_1.LastMileDelivery).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: ['lastMileDeliverySettings'] }));
35
41
  return { items, total };
36
42
  }
43
+ async checkActiveLastMileDelivery(context) {
44
+ const { domain } = context.state;
45
+ const count = await (0, typeorm_1.getRepository)(last_mile_delivery_1.LastMileDelivery).count({
46
+ where: { domain, status: 'active' }
47
+ });
48
+ return count > 0;
49
+ }
37
50
  async domain(lastMileDelivery) {
38
51
  return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(lastMileDelivery.domainId);
39
52
  }
@@ -61,6 +74,13 @@ __decorate([
61
74
  __metadata("design:paramtypes", [typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object, Object]),
62
75
  __metadata("design:returntype", Promise)
63
76
  ], LastMileDeliveryQuery.prototype, "lastMileDeliveries", null);
77
+ __decorate([
78
+ (0, type_graphql_1.Query)(returns => Boolean),
79
+ __param(0, (0, type_graphql_1.Ctx)()),
80
+ __metadata("design:type", Function),
81
+ __metadata("design:paramtypes", [Object]),
82
+ __metadata("design:returntype", Promise)
83
+ ], LastMileDeliveryQuery.prototype, "checkActiveLastMileDelivery", null);
64
84
  __decorate([
65
85
  (0, type_graphql_1.FieldResolver)(type => shell_1.Domain),
66
86
  __param(0, (0, type_graphql_1.Root)()),
package/dist-server/service/last-mile-delivery/last-mile-delivery-query.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"last-mile-delivery-query.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/last-mile-delivery-query.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"last-mile-delivery-query.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/last-mile-delivery-query.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/integration-lmd",
3
- "version": "4.3.332",
3
+ "version": "4.3.342",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -49,5 +49,5 @@
49
49
  "nock": "^13.0.2",
50
50
  "should": "^13.2.3"
51
51
  },
52
- "gitHead": "b47cf5177c9ad03115855210e012fb06aa28f8d0"
52
+ "gitHead": "730f56464dd0d8fb576de67e82bd1048d9051af8"
53
53
  }
package/server/controllers/lmd-middleware/apis/create-parcel.ts CHANGED
@@ -52,7 +52,8 @@ export function createParcel() {
52
52
  return res.map(parcel => {
53
53
  return {
54
54
  parcelId: parcel?.data?.parcel_id,
55
- refNo: parcel?.data?.ref_no
55
+ refNo: parcel?.data?.ref_no,
56
+ transporter: parcel?.courier
56
57
  }
57
58
  })
58
59
  }
package/server/service/last-mile-delivery/last-mile-delivery-query.ts CHANGED
@@ -1,12 +1,24 @@
1
- import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
1
+ import {
2
+ Arg,
3
+ Args,
4
+ Ctx,
5
+ Directive,
6
+ FieldResolver,
7
+ Query,
8
+ Resolver,
9
+ Root
10
+ } from 'type-graphql'
2
11
  import { getRepository } from 'typeorm'
3
- import { Domain, ListParam, convertListParams } from '@things-factory/shell'
12
+
4
13
  import { User } from '@things-factory/auth-base'
14
+ import {
15
+ convertListParams,
16
+ Domain,
17
+ ListParam
18
+ } from '@things-factory/shell'
19
+
5
20
  import { LastMileDelivery } from './last-mile-delivery'
6
- import { LastMileDeliverySetting } from '../last-mile-delivery-setting/last-mile-delivery-setting'
7
21
  import { LastMileDeliveryList } from './last-mile-delivery-type'
8
- import { LastMileDeliveryBizplace, LastMileDeliveryBizplaceStatus } from '../last-mile-delivery-bizplace/last-mile-delivery-bizplace'
9
- import { LastMileDeliveryBizplaceList } from '../last-mile-delivery-bizplace/last-mile-delivery-bizplace-type'
10
22
 
11
23
  @Resolver(LastMileDelivery)
12
24
  export class LastMileDeliveryQuery {
@@ -15,7 +27,13 @@ export class LastMileDeliveryQuery {
15
27
  async lastMileDelivery(@Arg('id') id: string, @Ctx() context: any): Promise<LastMileDelivery> {
16
28
  const { domain, user, tx } = context.state
17
29
  const result = await tx.getRepository(LastMileDelivery).findOne({
18
- where: { id }, relations: ['lastMileDeliverySettings', 'lastMileDeliverySettings.geoCountry', 'lastMileDeliveryBizplaces','lastMileDeliveryBizplaces.bizplace']
30
+ where: { id },
31
+ relations: [
32
+ 'lastMileDeliverySettings',
33
+ 'lastMileDeliverySettings.geoCountry',
34
+ 'lastMileDeliveryBizplaces',
35
+ 'lastMileDeliveryBizplaces.bizplace'
36
+ ]
19
37
  })
20
38
  return result
21
39
  }
@@ -25,11 +43,25 @@ export class LastMileDeliveryQuery {
25
43
  const { domain } = context.state
26
44
 
27
45
  const convertedParams = convertListParams(params, domain.id)
28
- const [items, total] = await getRepository(LastMileDelivery).findAndCount({...convertedParams, relations: ['lastMileDeliverySettings']})
46
+ const [items, total] = await getRepository(LastMileDelivery).findAndCount({
47
+ ...convertedParams,
48
+ relations: ['lastMileDeliverySettings']
49
+ })
29
50
 
30
51
  return { items, total }
31
52
  }
32
53
 
54
+ @Query(returns => Boolean)
55
+ async checkActiveLastMileDelivery(@Ctx() context: any): Promise<Boolean> {
56
+ const { domain } = context.state
57
+
58
+ const count = await getRepository(LastMileDelivery).count({
59
+ where: { domain, status: 'active' }
60
+ })
61
+
62
+ return count > 0
63
+ }
64
+
33
65
  @FieldResolver(type => Domain)
34
66
  async domain(@Root() lastMileDelivery: LastMileDelivery): Promise<Domain> {
35
67
  return await getRepository(Domain).findOne(lastMileDelivery.domainId)