@things-factory/worksheet-base 4.3.482 → 4.3.490

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 (6) hide show
  1. package/dist-server/graphql/resolvers/worksheet/fetch-powrup-document.js +24 -15
  2. package/dist-server/graphql/resolvers/worksheet/fetch-powrup-document.js.map +1 -1
  3. package/dist-server/graphql/types/worksheet/index.js +1 -1
  4. package/package.json +3 -3
  5. package/server/graphql/resolvers/worksheet/fetch-powrup-document.ts +25 -16
  6. package/server/graphql/types/worksheet/index.ts +1 -1
package/dist-server/graphql/resolvers/worksheet/fetch-powrup-document.js CHANGED
@@ -6,13 +6,17 @@ const integration_powrup_1 = require("@things-factory/integration-powrup");
6
6
  const sales_base_1 = require("@things-factory/sales-base");
7
7
  const env_1 = require("@things-factory/env");
8
8
  exports.fetchPowrupDocumentResolver = {
9
- async fetchPowrupDocument(_, { releaseGoodId }, context) {
9
+ async fetchPowrupDocument(_, { orderPackageId }, context) {
10
10
  const { tx, domain, user } = context.state;
11
- //find release goods base on id
12
- let releaseGood = await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).findOne({
13
- where: { domain, id: releaseGoodId },
14
- relations: ['bizplace', 'bizplace.domain']
11
+ //find order package base on id
12
+ let orderPackage = await (0, typeorm_1.getRepository)(sales_base_1.OrderPackage).findOne({
13
+ where: { domain, id: orderPackageId },
14
+ relations: ['bizplace', 'bizplace.domain', 'releaseGood']
15
15
  });
16
+ let releaseGood = orderPackage.releaseGood;
17
+ if (orderPackage === null || orderPackage === void 0 ? void 0 : orderPackage.airwayBill) {
18
+ return { airwayBill: orderPackage === null || orderPackage === void 0 ? void 0 : orderPackage.airwayBill, invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice };
19
+ }
16
20
  //find user powrup data
17
21
  const powrup = await (0, typeorm_1.getRepository)(integration_powrup_1.Powrup).findOne({
18
22
  active: true,
@@ -22,23 +26,28 @@ exports.fetchPowrupDocumentResolver = {
22
26
  const powrupCtrl = new sales_base_1.PowrupController();
23
27
  try {
24
28
  // fetch document if not found
25
- if (powrup && !(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {
29
+ if (powrup && !(orderPackage === null || orderPackage === void 0 ? void 0 : orderPackage.airwayBill)) {
26
30
  try {
31
+ if (!(orderPackage === null || orderPackage === void 0 ? void 0 : orderPackage.marketRtsCallSuccess)) {
32
+ try {
33
+ // retry initiate order document
34
+ await powrupCtrl.initiateShipment(powrup, releaseGood, domain, user, tx);
35
+ }
36
+ catch (error) {
37
+ console.log(`initiateShipment: ${error}`);
38
+ }
39
+ }
27
40
  // try fetch order document / AWB
28
- releaseGood = await powrupCtrl.fetchDocument(powrup, releaseGood);
41
+ releaseGood = await powrupCtrl.fetchDocument(powrup, orderPackage.releaseGood);
29
42
  }
30
43
  catch (error) {
31
- try {
32
- // retry initiate order document
33
- await powrupCtrl.initiateShipment(powrup, releaseGood, domain, user, tx);
34
- }
35
- catch (error) {
36
- throw new Error(`initiateShipment: ${error}`);
37
- }
38
44
  throw new Error(`fetchDocument: ${error}`);
39
45
  }
40
46
  }
41
- const airwayBill = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill;
47
+ orderPackage = await (0, typeorm_1.getRepository)(sales_base_1.OrderPackage).findOne({
48
+ where: { domain, id: orderPackageId }
49
+ });
50
+ const airwayBill = orderPackage === null || orderPackage === void 0 ? void 0 : orderPackage.airwayBill;
42
51
  const invoice = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice;
43
52
  return { airwayBill, invoice };
44
53
  }
package/dist-server/graphql/resolvers/worksheet/fetch-powrup-document.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fetch-powrup-document.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/fetch-powrup-document.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAGtD,2EAA2D;AAC3D,2DAA0E;AAE1E,6CAA4C;AAE/B,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QAC/D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,+BAA+B;QAC/B,IAAI,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YACtE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE;YACpC,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC;SAC3C,CAAC,CAAA;QAEF,uBAAuB;QACvB,MAAM,MAAM,GAAW,MAAM,IAAA,uBAAa,EAAC,2BAAM,CAAC,CAAC,OAAO,CAAC;YACzD,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAA;QAEF,gCAAgC;QAChC,MAAM,UAAU,GAAqB,IAAI,6BAAgB,EAAE,CAAA;QAE3D,IAAI;YACF,8BAA8B;YAC9B,IAAI,MAAM,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAA,EAAE;gBACtC,IAAI;oBACF,iCAAiC;oBACjC,WAAW,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;iBAClE;gBAAC,OAAO,KAAK,EAAE;oBACd,IAAI;wBACF,gCAAgC;wBAChC,MAAM,UAAU,CAAC,gBAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;qBACzE;oBAAC,OAAO,KAAK,EAAE;wBACd,MAAM,IAAI,KAAK,CAAC,qBAAqB,KAAK,EAAE,CAAC,CAAA;qBAC9C;oBACD,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAA;iBAC3C;aACF;YAED,MAAM,UAAU,GAAW,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAA;YAClD,MAAM,OAAO,GAAW,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAA;YAC5C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAA;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,YAAM,CAAC,KAAK,CACV,8CAA8C,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,KAAK,GAAG,CACjH,CAAA;YAED,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;SAC5E;IACH,CAAC;CACF,CAAA"}
1
+ {"version":3,"file":"fetch-powrup-document.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/fetch-powrup-document.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAGtD,2EAA2D;AAC3D,2DAAwF;AAExF,6CAA4C;AAE/B,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,cAAc,EAAE,EAAE,OAAY;QAChE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,+BAA+B;QAC/B,IAAI,YAAY,GAAiB,MAAM,IAAA,uBAAa,EAAC,yBAAY,CAAC,CAAC,OAAO,CAAC;YACzE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,cAAc,EAAE;YACrC,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,aAAa,CAAC;SAC1D,CAAC,CAAA;QACF,IAAI,WAAW,GAAG,YAAY,CAAC,WAAW,CAAA;QAE1C,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,UAAU,EAAE;YAC5B,OAAO,EAAE,UAAU,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,UAAU,EAAE,OAAO,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,CAAA;SAC/E;QAED,uBAAuB;QACvB,MAAM,MAAM,GAAW,MAAM,IAAA,uBAAa,EAAC,2BAAM,CAAC,CAAC,OAAO,CAAC;YACzD,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAA;QAEF,gCAAgC;QAChC,MAAM,UAAU,GAAqB,IAAI,6BAAgB,EAAE,CAAA;QAE3D,IAAI;YACF,8BAA8B;YAC9B,IAAI,MAAM,IAAI,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,UAAU,CAAA,EAAE;gBACvC,IAAI;oBACF,IAAI,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,oBAAoB,CAAA,EAAE;wBACvC,IAAI;4BACF,gCAAgC;4BAChC,MAAM,UAAU,CAAC,gBAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;yBACzE;wBAAC,OAAO,KAAK,EAAE;4BACd,OAAO,CAAC,GAAG,CAAC,qBAAqB,KAAK,EAAE,CAAC,CAAA;yBAC1C;qBACF;oBACD,iCAAiC;oBACjC,WAAW,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,CAAA;iBAC/E;gBAAC,OAAO,KAAK,EAAE;oBACd,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAA;iBAC3C;aACF;YACD,YAAY,GAAG,MAAM,IAAA,uBAAa,EAAC,yBAAY,CAAC,CAAC,OAAO,CAAC;gBACvD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,cAAc,EAAE;aACtC,CAAC,CAAA;YACF,MAAM,UAAU,GAAW,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,UAAU,CAAA;YACnD,MAAM,OAAO,GAAW,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAA;YAC5C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAA;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,YAAM,CAAC,KAAK,CACV,8CAA8C,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,KAAK,GAAG,CACjH,CAAA;YAED,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;SAC5E;IACH,CAAC;CACF,CAAA"}
package/dist-server/graphql/types/worksheet/index.js CHANGED
@@ -79,7 +79,7 @@ exports.Mutation = `
79
79
  ): SellercraftDocument @privilege(category: "worksheet_control", privilege: "mutation") @transaction
80
80
 
81
81
  fetchPowrupDocument (
82
- releaseGoodId: String!
82
+ orderPackageId: String!
83
83
  ): PowrupDocument @privilege(category: "worksheet_control", privilege: "mutation") @transaction
84
84
 
85
85
  generateSortingWorksheet (
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.3.482",
3
+ "version": "4.3.490",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -36,7 +36,7 @@
36
36
  "@things-factory/integration-sftp": "^4.3.479",
37
37
  "@things-factory/marketplace-base": "^4.3.479",
38
38
  "@things-factory/notification": "^4.3.452",
39
- "@things-factory/sales-base": "^4.3.482",
39
+ "@things-factory/sales-base": "^4.3.490",
40
40
  "@things-factory/setting-base": "^4.3.452",
41
41
  "@things-factory/shell": "^4.3.434",
42
42
  "@things-factory/transport-base": "^4.3.452",
@@ -45,5 +45,5 @@
45
45
  "puppeteer": "21.0.3",
46
46
  "uuid": "^9.0.0"
47
47
  },
48
- "gitHead": "86a240e223158a81df6991a47e9caa2f4650a54a"
48
+ "gitHead": "9911935fcf3c393ca89a7244d28e9eb540969622"
49
49
  }
package/server/graphql/resolvers/worksheet/fetch-powrup-document.ts CHANGED
@@ -2,19 +2,24 @@ import { EntityManager, getRepository } from 'typeorm'
2
2
 
3
3
  import { User } from '@things-factory/auth-base'
4
4
  import { Powrup } from '@things-factory/integration-powrup'
5
- import { ReleaseGood, PowrupController } from '@things-factory/sales-base'
5
+ import { ReleaseGood, OrderPackage, PowrupController } from '@things-factory/sales-base'
6
6
  import { Domain } from '@things-factory/shell'
7
7
  import { logger } from '@things-factory/env'
8
8
 
9
9
  export const fetchPowrupDocumentResolver = {
10
- async fetchPowrupDocument(_: any, { releaseGoodId }, context: any) {
10
+ async fetchPowrupDocument(_: any, { orderPackageId }, context: any) {
11
11
  const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
12
12
 
13
- //find release goods base on id
14
- let releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
15
- where: { domain, id: releaseGoodId },
16
- relations: ['bizplace', 'bizplace.domain']
13
+ //find order package base on id
14
+ let orderPackage: OrderPackage = await getRepository(OrderPackage).findOne({
15
+ where: { domain, id: orderPackageId },
16
+ relations: ['bizplace', 'bizplace.domain', 'releaseGood']
17
17
  })
18
+ let releaseGood = orderPackage.releaseGood
19
+
20
+ if (orderPackage?.airwayBill) {
21
+ return { airwayBill: orderPackage?.airwayBill, invoice: releaseGood?.invoice }
22
+ }
18
23
 
19
24
  //find user powrup data
20
25
  const powrup: Powrup = await getRepository(Powrup).findOne({
@@ -27,22 +32,26 @@ export const fetchPowrupDocumentResolver = {
27
32
 
28
33
  try {
29
34
  // fetch document if not found
30
- if (powrup && !releaseGood?.airwayBill) {
35
+ if (powrup && !orderPackage?.airwayBill) {
31
36
  try {
37
+ if (!orderPackage?.marketRtsCallSuccess) {
38
+ try {
39
+ // retry initiate order document
40
+ await powrupCtrl.initiateShipment(powrup, releaseGood, domain, user, tx)
41
+ } catch (error) {
42
+ console.log(`initiateShipment: ${error}`)
43
+ }
44
+ }
32
45
  // try fetch order document / AWB
33
- releaseGood = await powrupCtrl.fetchDocument(powrup, releaseGood)
46
+ releaseGood = await powrupCtrl.fetchDocument(powrup, orderPackage.releaseGood)
34
47
  } catch (error) {
35
- try {
36
- // retry initiate order document
37
- await powrupCtrl.initiateShipment(powrup, releaseGood, domain, user, tx)
38
- } catch (error) {
39
- throw new Error(`initiateShipment: ${error}`)
40
- }
41
48
  throw new Error(`fetchDocument: ${error}`)
42
49
  }
43
50
  }
44
-
45
- const airwayBill: string = releaseGood?.airwayBill
51
+ orderPackage = await getRepository(OrderPackage).findOne({
52
+ where: { domain, id: orderPackageId }
53
+ })
54
+ const airwayBill: string = orderPackage?.airwayBill
46
55
  const invoice: string = releaseGood?.invoice
47
56
  return { airwayBill, invoice }
48
57
  } catch (error) {
package/server/graphql/types/worksheet/index.ts CHANGED
@@ -77,7 +77,7 @@ export const Mutation = /* GraphQL */ `
77
77
  ): SellercraftDocument @privilege(category: "worksheet_control", privilege: "mutation") @transaction
78
78
 
79
79
  fetchPowrupDocument (
80
- releaseGoodId: String!
80
+ orderPackageId: String!
81
81
  ): PowrupDocument @privilege(category: "worksheet_control", privilege: "mutation") @transaction
82
82
 
83
83
  generateSortingWorksheet (