@things-factory/id-rule-base 4.0.11 → 4.0.12

package/dist-server/constants/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./sequence-type"), exports);
+//# sourceMappingURL=index.js.map

package/dist-server/constants/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/constants/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA+B"}

package/dist-server/constants/sequence-type.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SEQUENCE_TYPE = void 0;
+exports.SEQUENCE_TYPE = {
+    PRODUCT_LABEL_COUNTER: 'PRODUCT_LABEL_COUNTER'
+};
+//# sourceMappingURL=sequence-type.js.map

package/dist-server/constants/sequence-type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sequence-type.js","sourceRoot":"","sources":["../../server/constants/sequence-type.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG;IAC3B,qBAAqB,EAAE,uBAAuB;CAC/C,CAAA"}

package/dist-server/service/sequence/sequence-mutation.js

@@ -15,51 +15,54 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SequenceMutation = void 0;
 const type_graphql_1 = require("type-graphql");
 const typeorm_1 = require("typeorm");
+const constants_1 = require("../../constants");
 const sequence_1 = require("./sequence");
 let SequenceMutation = class SequenceMutation {
-    async upsertSequence(pattern, counter, context) {
+    async upsertSequence(type, counter, bizplaceId, context) {
         const { domain } = context.state;
         const seqRepo = (0, typeorm_1.getRepository)(sequence_1.Sequence);
         const now = new Date();
         const expiresAt = new Date(now.setMonth(now.getMonth() + 12));
-        pattern = `${pattern} [${getDateStr()}]`;
+        const patternObj = {
+            type,
+            date: new Date().toISOString().split('T')[0],
+            bizplaceId
+        };
+        const pattern = JSON.stringify(patternObj);
         const foundSeq = await seqRepo.findOne({
-            where: { pattern, domain }
+            where: { pattern, type: constants_1.SEQUENCE_TYPE.PRODUCT_LABEL_COUNTER, domain }
         });
         if (foundSeq) {
-            return await seqRepo.save(Object.assign(Object.assign({}, foundSeq), { seq: counter ? foundSeq.seq + counter : foundSeq.seq + 1, expiresAt }));
+            return await seqRepo.update({ id: foundSeq.id }, {
+                pattern,
+                seq: counter ? foundSeq.seq + counter : foundSeq.seq + 1,
+                expiresAt,
+                updatedAt: now
+            });
         }
         else {
             return await seqRepo.save({
                 domain,
                 pattern,
                 seq: counter || 1,
-                expiresAt
+                expiresAt,
+                type: constants_1.SEQUENCE_TYPE.PRODUCT_LABEL_COUNTER
             });
         }
     }
 };
 __decorate([
     (0, type_graphql_1.Mutation)(returns => sequence_1.Sequence),
-    __param(0, (0, type_graphql_1.Arg)('pattern')),
+    __param(0, (0, type_graphql_1.Arg)('type')),
     __param(1, (0, type_graphql_1.Arg)('counter')),
-    __param(2, (0, type_graphql_1.Ctx)()),
+    __param(2, (0, type_graphql_1.Arg)('bizplaceId')),
+    __param(3, (0, type_graphql_1.Ctx)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Number, Object]),
+    __metadata("design:paramtypes", [String, Number, String, Object]),
     __metadata("design:returntype", Promise)
 ], SequenceMutation.prototype, "upsertSequence", null);
 SequenceMutation = __decorate([
     (0, type_graphql_1.Resolver)(sequence_1.Sequence)
 ], SequenceMutation);
 exports.SequenceMutation = SequenceMutation;
-function getDateStr() {
-    const today = new Date();
-    const year = today.getFullYear();
-    const month = today.getMonth();
-    const day = today.getDate();
-    const yy = String(year).substr(String(year).length - 2);
-    const mm = String(month + 1).padStart(2, '0');
-    const dd = String(day).padStart(2, '0');
-    return yy + mm + dd;
-}
 //# sourceMappingURL=sequence-mutation.js.map

package/dist-server/service/sequence/sequence-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"sequence-mutation.js","sourceRoot":"","sources":["../../../server/service/sequence/sequence-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAA2D;AAC3D,qCAAuC;AAEvC,yCAAqC;AAGrC,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAE3B,KAAK,CAAC,cAAc,CAAiB,OAAe,EAAkB,OAAe,EAAS,OAAY;QACxG,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAChC,MAAM,OAAO,GAAG,IAAA,uBAAa,EAAC,mBAAQ,CAAC,CAAA;QACvC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;QACtB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;QAE7D,OAAO,GAAG,GAAG,OAAO,KAAK,UAAU,EAAE,GAAG,CAAA;QAExC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC;YACrC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;SAC3B,CAAC,CAAA;QAEF,IAAI,QAAQ,EAAE;YACZ,OAAO,MAAM,OAAO,CAAC,IAAI,iCACpB,QAAQ,KACX,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,EACxD,SAAS,IACT,CAAA;SACH;aAAM;YACL,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC;gBACxB,MAAM;gBACN,OAAO;gBACP,GAAG,EAAE,OAAO,IAAI,CAAC;gBACjB,SAAS;aACV,CAAC,CAAA;SACH;IACH,CAAC;CACF,CAAA;AA3BC;IADC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,mBAAQ,CAAC;IACR,WAAA,IAAA,kBAAG,EAAC,SAAS,CAAC,CAAA;IAAmB,WAAA,IAAA,kBAAG,EAAC,SAAS,CAAC,CAAA;IAAmB,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;sDA0B5F;AA5BU,gBAAgB;IAD5B,IAAA,uBAAQ,EAAC,mBAAQ,CAAC;GACN,gBAAgB,CA6B5B;AA7BY,4CAAgB;AA+B7B,SAAS,UAAU;IACjB,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAA;IACxB,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,EAAE,CAAA;IAChC,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;IAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,EAAE,CAAA;IAE3B,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACvD,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IAC7C,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IAEvC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;AACrB,CAAC"}
+{"version":3,"file":"sequence-mutation.js","sourceRoot":"","sources":["../../../server/service/sequence/sequence-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAA2D;AAC3D,qCAAuC;AAEvC,+CAA+C;AAC/C,yCAAqC;AAGrC,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAE3B,KAAK,CAAC,cAAc,CACL,IAAY,EACT,OAAe,EACZ,UAAkB,EAC9B,OAAY;QAEnB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAChC,MAAM,OAAO,GAAG,IAAA,uBAAa,EAAC,mBAAQ,CAAC,CAAA;QACvC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;QACtB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;QAE7D,MAAM,UAAU,GAAQ;YACtB,IAAI;YACJ,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC5C,UAAU;SACX,CAAA;QAED,MAAM,OAAO,GAAW,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QAElD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC;YACrC,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,yBAAa,CAAC,qBAAqB,EAAE,MAAM,EAAE;SACtE,CAAC,CAAA;QAEF,IAAI,QAAQ,EAAE;YACZ,OAAO,MAAM,OAAO,CAAC,MAAM,CACzB,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,EACnB;gBACE,OAAO;gBACP,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;gBACxD,SAAS;gBACT,SAAS,EAAE,GAAG;aACf,CACF,CAAA;SACF;aAAM;YACL,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC;gBACxB,MAAM;gBACN,OAAO;gBACP,GAAG,EAAE,OAAO,IAAI,CAAC;gBACjB,SAAS;gBACT,IAAI,EAAE,yBAAa,CAAC,qBAAqB;aAC1C,CAAC,CAAA;SACH;IACH,CAAC;CACF,CAAA;AA3CC;IADC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,mBAAQ,CAAC;IAE3B,WAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;IACX,WAAA,IAAA,kBAAG,EAAC,SAAS,CAAC,CAAA;IACd,WAAA,IAAA,kBAAG,EAAC,YAAY,CAAC,CAAA;IACjB,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;sDAsCP;AA5CU,gBAAgB;IAD5B,IAAA,uBAAQ,EAAC,mBAAQ,CAAC;GACN,gBAAgB,CA6C5B;AA7CY,4CAAgB"}

package/dist-server/service/sequence/sequence.js

@@ -38,6 +38,11 @@ __decorate([
     (0, type_graphql_1.Field)(),
     __metadata("design:type", Number)
 ], Sequence.prototype, "seq", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    (0, type_graphql_1.Field)(),
+    __metadata("design:type", String)
+], Sequence.prototype, "type", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
     (0, type_graphql_1.Field)(),

package/dist-server/service/sequence/sequence.js.map

@@ -1 +1 @@
-{"version":3,"file":"sequence.js","sourceRoot":"","sources":["../../../server/service/sequence/sequence.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoD;AACpD,qCAAsH;AAEtH,iDAA8C;AAO9C,IAAa,QAAQ,GAArB,MAAa,QAAQ;CA8BpB,CAAA;AA3BC;IAFC,IAAA,gCAAsB,EAAC,MAAM,CAAC;IAC9B,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,CAAC;;oCACC;AAInB;IAFC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;IACzB,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDACd,cAAM,oBAAN,cAAM;wCAAA;AAId;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;yCACO;AAMf;IAJC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,UAAU;KACjB,CAAC;IACD,IAAA,oBAAK,GAAE;;qCACG;AAIX;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;8BACG,IAAI;2CAAA;AAIf;IAFC,IAAA,0BAAgB,GAAE;IAClB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;2CAAA;AAIf;IAFC,IAAA,0BAAgB,GAAE;IAClB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;2CAAA;AA7BJ,QAAQ;IALpB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,eAAe,EAAE,CAAC,GAAa,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACtF,IAAA,eAAK,EAAC,eAAe,EAAE,CAAC,GAAa,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxD,IAAA,eAAK,EAAC,eAAe,EAAE,CAAC,GAAa,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1D,IAAA,yBAAU,GAAE;GACA,QAAQ,CA8BpB;AA9BY,4BAAQ"}
+{"version":3,"file":"sequence.js","sourceRoot":"","sources":["../../../server/service/sequence/sequence.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoD;AACpD,qCAAsH;AAEtH,iDAA8C;AAO9C,IAAa,QAAQ,GAArB,MAAa,QAAQ;CAmCpB,CAAA;AAhCC;IAFC,IAAA,gCAAsB,EAAC,MAAM,CAAC;IAC9B,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,CAAC;;oCACC;AAInB;IAFC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;IACzB,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDACd,cAAM,oBAAN,cAAM;wCAAA;AAId;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;yCACO;AAMf;IAJC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,UAAU;KACjB,CAAC;IACD,IAAA,oBAAK,GAAE;;qCACG;AAKX;IAFC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,GAAE;;sCACI;AAIZ;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;8BACG,IAAI;2CAAA;AAIf;IAFC,IAAA,0BAAgB,GAAE;IAClB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;2CAAA;AAIf;IAFC,IAAA,0BAAgB,GAAE;IAClB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;2CAAA;AAlCJ,QAAQ;IALpB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,eAAe,EAAE,CAAC,GAAa,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACtF,IAAA,eAAK,EAAC,eAAe,EAAE,CAAC,GAAa,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxD,IAAA,eAAK,EAAC,eAAe,EAAE,CAAC,GAAa,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1D,IAAA,yBAAU,GAAE;GACA,QAAQ,CAmCpB;AAnCY,4BAAQ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/id-rule-base",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,14 +24,14 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/grist-ui": "^4.0.11",
-    "@things-factory/i18n-base": "^4.0.11",
-    "@things-factory/setting-base": "^4.0.11",
-    "@things-factory/shell": "^4.0.11",
+    "@things-factory/grist-ui": "^4.0.12",
+    "@things-factory/i18n-base": "^4.0.12",
+    "@things-factory/setting-base": "^4.0.12",
+    "@things-factory/shell": "^4.0.12",
     "codemirror": "^5.59.1"
   },
   "devDependencies": {
     "@types/codemirror": "^0.0.105"
   },
-  "gitHead": "47745d8cdbe99f11d8d69bbcab3901c9771525a0"
+  "gitHead": "29d59ff95fcb473cb43c6f798cd04f3ec3a779a0"
 }

package/server/constants/index.ts

@@ -0,0 +1 @@
+export * from './sequence-type'

package/server/constants/sequence-type.ts

@@ -0,0 +1,3 @@
+export const SEQUENCE_TYPE = {
+  PRODUCT_LABEL_COUNTER: 'PRODUCT_LABEL_COUNTER'
+}

package/server/service/sequence/sequence-mutation.ts

@@ -1,49 +1,53 @@
 import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
 import { getRepository } from 'typeorm'
 
+import { SEQUENCE_TYPE } from '../../constants'
 import { Sequence } from './sequence'
 
 @Resolver(Sequence)
 export class SequenceMutation {
   @Mutation(returns => Sequence)
-  async upsertSequence(@Arg('pattern') pattern: string, @Arg('counter') counter: number, @Ctx() context: any) {
+  async upsertSequence(
+    @Arg('type') type: string,
+    @Arg('counter') counter: number,
+    @Arg('bizplaceId') bizplaceId: string,
+    @Ctx() context: any
+  ) {
     const { domain } = context.state
     const seqRepo = getRepository(Sequence)
     const now = new Date()
     const expiresAt = new Date(now.setMonth(now.getMonth() + 12))
 
-    pattern = `${pattern} [${getDateStr()}]`
+    const patternObj: any = {
+      type,
+      date: new Date().toISOString().split('T')[0],
+      bizplaceId
+    }
+
+    const pattern: string = JSON.stringify(patternObj)
 
     const foundSeq = await seqRepo.findOne({
-      where: { pattern, domain }
+      where: { pattern, type: SEQUENCE_TYPE.PRODUCT_LABEL_COUNTER, domain }
     })
 
     if (foundSeq) {
-      return await seqRepo.save({
-        ...foundSeq,
-        seq: counter ? foundSeq.seq + counter : foundSeq.seq + 1,
-        expiresAt
-      })
+      return await seqRepo.update(
+        { id: foundSeq.id },
+        {
+          pattern,
+          seq: counter ? foundSeq.seq + counter : foundSeq.seq + 1,
+          expiresAt,
+          updatedAt: now
+        }
+      )
     } else {
       return await seqRepo.save({
         domain,
         pattern,
         seq: counter || 1,
-        expiresAt
+        expiresAt,
+        type: SEQUENCE_TYPE.PRODUCT_LABEL_COUNTER
       })
     }
   }
 }
-
-function getDateStr() {
-  const today = new Date()
-  const year = today.getFullYear()
-  const month = today.getMonth()
-  const day = today.getDate()
-
-  const yy = String(year).substr(String(year).length - 2)
-  const mm = String(month + 1).padStart(2, '0')
-  const dd = String(day).padStart(2, '0')
-
-  return yy + mm + dd
-}

package/server/service/sequence/sequence.ts

@@ -27,6 +27,11 @@ export class Sequence {
   @Field()
   seq: number
 
+  //// to differentiate between normal pattern sequence VS label counter ////
+  @Column({ nullable: true })
+  @Field()
+  type: string
+
   @Column()
   @Field()
   expiresAt: Date