@chevre/domain 23.2.0-alpha.47 → 23.2.0-alpha.48

package/example/src/chevre/orderNumber/testRandomness.ts

@@ -25,10 +25,16 @@ async function testGeneration() {
         });
 
         // 復号して元のデータに戻るかチェック
-        const decoded = await orderNumberRepo.decrypt(orderNumber);
-        const isSuccess = decoded === `${ts.valueOf()}${(i + 1).toString()
-            // tslint:disable-next-line:no-magic-numbers
-            .padStart(2, '0')}`;
+        let decoded: string;
+        let isSuccess: boolean = false;
+        try {
+            decoded = await orderNumberRepo.decrypt(orderNumber);
+            isSuccess = decoded === `${ts.valueOf()}${(i + 1).toString()
+                // tslint:disable-next-line:no-magic-numbers
+                .padStart(2, '0')}`;
+        } catch (error) {
+            decoded = error.message;
+        }
 
         results.push({
             timestamp: ts.valueOf()

package/example/src/chevre/settings/addSettings.ts

@@ -1,4 +1,5 @@
 // tslint:disable:no-console
+import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../../lib/index';
@@ -17,12 +18,14 @@ async function main() {
     const setting = await settingRepo.findOne({ project: { id: { $eq: '*' } } }, ['orderNumber', 'transactionNumber']);
     console.log(setting);
 
-    if (typeof setting?.orderNumber?.version !== 'string') {
+    if (typeof setting?.orderNumber?.version !== 'string' || !(setting?.orderNumber?.validFrom instanceof Date)) {
         console.log('updating orderNumber...');
         await settingRepo.updateByProject(
             { project: { id: { $eq: '*' } } },
             {
                 orderNumber: {
+                    validFrom: moment('2026-01-31T15:00:00Z')
+                        .toDate(),
                     fpeSecret: FPE_SECRET,
                     version: 'A'
                 }
@@ -31,12 +34,14 @@ async function main() {
         console.log('orderNumber updated.');
     }
 
-    if (typeof setting?.transactionNumber?.version !== 'string') {
+    if (typeof setting?.transactionNumber?.version !== 'string' || !(setting?.transactionNumber?.validFrom instanceof Date)) {
         console.log('updating orderNumber...');
         await settingRepo.updateByProject(
             { project: { id: { $eq: '*' } } },
             {
                 transactionNumber: {
+                    validFrom: moment('2026-01-31T15:00:00Z')
+                        .toDate(),
                     fpeSecret: FPE_SECRET,
                     version: '1'
                 }

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -111,16 +111,18 @@ export interface IJWTSetting {
     algorithm: Algorithm;
 }
 export interface IOrderNumberSetting {
+    validFrom: Date;
     /**
      * fpe暗号鍵
      */
     fpeSecret: string;
     /**
-     * "1"
+     * "A"
      */
     version: string;
 }
 export interface ITransactionNumberSetting {
+    validFrom: Date;
     /**
      * fpe暗号鍵
      */

package/lib/chevre/repo/orderNumber.d.ts

@@ -8,6 +8,7 @@ export declare class OrderNumberRepo {
     constructor(params: {
         connection: Connection;
     });
+    static GENERATE_VERSION0(timestamp: string, seq: number): string;
     /**
      * タイムスタンプから発行する
      */

package/lib/chevre/repo/orderNumber.js

@@ -44,12 +44,21 @@ class OrderNumberRepo {
     //         params.timestamp
     //     );
     // }
+    static GENERATE_VERSION0(timestamp, seq) {
+        let orderNumber = `${timestamp}${seq}`;
+        // checkdigit
+        const cd = cdigit.luhn.compute(orderNumber);
+        orderNumber = fpe({ password: cd })
+            .encrypt(orderNumber);
+        orderNumber = `${cd}${orderNumber}`;
+        return orderNumber;
+    }
     /**
      * タイムスタンプから発行する
      */
     publishByTimestamp(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { fpeSecret, version } = yield this.findSetting();
+            const { fpeSecret, version, validFrom } = yield this.findSetting();
             const timestamp = moment(params.orderDate)
                 .valueOf()
                 .toString();
@@ -68,7 +77,9 @@ class OrderNumberRepo {
                 expires: dataFeedExpires
             });
             let orderNumber;
-            if (typeof fpeSecret === 'string' && typeof version === 'string') {
+            const useVersioning = validFrom instanceof Date && moment(validFrom)
+                .isSameOrBefore(params.orderDate);
+            if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
                 const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
                 orderNumber = transactionFactory.generate(timestamp, incrReply);
                 orderNumber = `${projectPrefix.at(0)}${orderNumber}`;
@@ -82,12 +93,14 @@ class OrderNumberRepo {
                 ].join(ORDER_NUMBER_SEPARATOR)}`;
             }
             else {
-                orderNumber = `${timestamp}${incrReply}`;
-                // checkdigit
-                const cd = cdigit.luhn.compute(orderNumber);
-                orderNumber = fpe({ password: cd })
-                    .encrypt(orderNumber);
-                orderNumber = `${projectPrefix}${cd}${orderNumber}`;
+                orderNumber = OrderNumberRepo.GENERATE_VERSION0(timestamp, incrReply);
+                orderNumber = `${projectPrefix}${orderNumber}`;
+                // orderNumber = `${timestamp}${incrReply}`;
+                // // checkdigit
+                // const cd = cdigit.luhn.compute(orderNumber);
+                // orderNumber = fpe({ password: cd })
+                //     .encrypt(orderNumber);
+                // orderNumber = `${projectPrefix}${cd}${orderNumber}`;
                 orderNumber = `${[
                     // tslint:disable-next-line:no-magic-numbers
                     orderNumber.slice(0, 4),
@@ -128,14 +141,17 @@ class OrderNumberRepo {
             if (setting === null || setting.orderNumber === undefined) {
                 return {};
             }
-            const { fpeSecret, version } = setting.orderNumber;
+            const { fpeSecret, version, validFrom } = setting.orderNumber;
             if (typeof fpeSecret !== 'string' || fpeSecret === '') {
                 throw new factory.errors.NotFound('setting.orderNumber.secret');
             }
             if (typeof version !== 'string' || version === '') {
                 throw new factory.errors.NotFound('setting.orderNumber.version');
             }
-            return { fpeSecret, version };
+            if (!(validFrom instanceof Date)) {
+                throw new factory.errors.NotFound('setting.orderNumber.validFrom must be Date');
+            }
+            return { fpeSecret, version, validFrom };
         });
     }
 }

package/lib/chevre/repo/transactionNumber.js

@@ -32,7 +32,7 @@ class TransactionNumberRepo {
      */
     publishByTimestamp(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { fpeSecret, version } = yield this.findSetting();
+            const { fpeSecret, version, validFrom } = yield this.findSetting();
             const timestamp = moment(params.startDate)
                 .valueOf()
                 .toString();
@@ -49,23 +49,11 @@ class TransactionNumberRepo {
                 expires: dataFeedExpires
             });
             let transactionNumber;
-            // let secret: string | undefined;
-            if (typeof fpeSecret === 'string' && typeof version === 'string') {
+            const useVersioning = validFrom instanceof Date && moment(validFrom)
+                .isSameOrBefore(params.startDate);
+            if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
                 const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
                 transactionNumber = transactionFactory.generate(timestamp, incrReply);
-                // // tslint:disable-next-line:no-magic-numbers
-                // const saltDigit = randomInt(0, 10);
-                // const saltStr = saltDigit.toString();
-                // secret = `${fpeSecret}${saltStr}`;
-                // const cipher = fpe2({ secret });
-                // // incrReplyが 0〜99 なら "00"〜"99" になり（15桁）
-                // // incrReplyが 100〜999 なら "100"〜"999" になる（16桁）
-                // const rawBody = `${timestamp}${incrReply.toString()
-                //     // tslint:disable-next-line:no-magic-numbers
-                //     .padStart(2, '0')}`;
-                // const encryptedBody = cipher.encrypt(rawBody);
-                // // ソルトを「あえて」2文字目に含める
-                // transactionNumber = `${version}${saltStr}${encryptedBody}`;
             }
             else {
                 transactionNumber = `${timestamp}${incrReply}`;
@@ -103,14 +91,17 @@ class TransactionNumberRepo {
             if (setting === null || setting.transactionNumber === undefined) {
                 return {};
             }
-            const { fpeSecret, version } = setting.transactionNumber;
+            const { fpeSecret, version, validFrom } = setting.transactionNumber;
             if (typeof fpeSecret !== 'string' || fpeSecret === '') {
                 throw new factory.errors.NotFound('setting.transactionNumber.secret');
             }
             if (typeof version !== 'string' || version === '') {
                 throw new factory.errors.NotFound('setting.transactionNumber.version');
             }
-            return { fpeSecret, version };
+            if (!(validFrom instanceof Date)) {
+                throw new factory.errors.NotFound('setting.transactionNumber.validFrom must be Date');
+            }
+            return { fpeSecret, version, validFrom };
         });
     }
 }

package/package.json

@@ -118,5 +118,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.47"
+  "version": "23.2.0-alpha.48"
 }