@chevre/domain 23.2.0-alpha.57 → 23.2.0-alpha.58
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.
|
@@ -121,6 +121,10 @@ export interface IOrderNumberSetting {
|
|
|
121
121
|
*/
|
|
122
122
|
version: string;
|
|
123
123
|
versioningForceProjects?: string[];
|
|
124
|
+
/**
|
|
125
|
+
* 強制的にバージョニング不使用のプロジェクト
|
|
126
|
+
*/
|
|
127
|
+
versioningExceptionProjects?: string[];
|
|
124
128
|
}
|
|
125
129
|
export interface ITransactionNumberSetting {
|
|
126
130
|
validFrom: Date;
|
|
@@ -12,10 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.OrderNumberRepo = void 0;
|
|
13
13
|
const cdigit = require("cdigit");
|
|
14
14
|
const moment = require("moment-timezone");
|
|
15
|
-
// import { RedisClientType } from 'redis';
|
|
16
15
|
// tslint:disable-next-line:no-require-imports no-var-requires
|
|
17
16
|
const fpe = require('node-fpe-v1');
|
|
18
|
-
// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
|
|
19
17
|
const factory = require("../factory");
|
|
20
18
|
const transactionNumber_1 = require("../factory/transactionNumber");
|
|
21
19
|
const setting_1 = require("./mongoose/schemas/setting");
|
|
@@ -32,23 +30,9 @@ const defaultVersioningForceProjects = [
|
|
|
32
30
|
*/
|
|
33
31
|
class OrderNumberRepo {
|
|
34
32
|
constructor(params) {
|
|
35
|
-
// const { connection } = params;
|
|
36
|
-
// this.settingModel = connection.model(settingModelName, createSettingSchema());
|
|
37
33
|
this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
|
|
38
34
|
this.settingModel = params.connection.model(setting_1.modelName, (0, setting_1.createSchema)());
|
|
39
35
|
}
|
|
40
|
-
// private static createKey(params: {
|
|
41
|
-
// orderDate: Date;
|
|
42
|
-
// projectPrefix: string;
|
|
43
|
-
// timestamp: string;
|
|
44
|
-
// }): string {
|
|
45
|
-
// return util.format(
|
|
46
|
-
// '%s:%s:%s',
|
|
47
|
-
// OrderNumberRepo.REDIS_KEY_PREFIX,
|
|
48
|
-
// params.projectPrefix,
|
|
49
|
-
// params.timestamp
|
|
50
|
-
// );
|
|
51
|
-
// }
|
|
52
36
|
static GENERATE_VERSION0(timestamp, seq) {
|
|
53
37
|
let orderNumber = `${timestamp}${seq}`;
|
|
54
38
|
// checkdigit
|
|
@@ -63,7 +47,7 @@ class OrderNumberRepo {
|
|
|
63
47
|
*/
|
|
64
48
|
publishByTimestamp(params) {
|
|
65
49
|
return __awaiter(this, void 0, void 0, function* () {
|
|
66
|
-
const { fpeSecret, version, validFrom, versioningForceProjects } = yield this.findSetting();
|
|
50
|
+
const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = yield this.findSetting();
|
|
67
51
|
const timestamp = moment(params.orderDate)
|
|
68
52
|
.valueOf()
|
|
69
53
|
.toString();
|
|
@@ -72,7 +56,6 @@ class OrderNumberRepo {
|
|
|
72
56
|
let dataFeedExpires;
|
|
73
57
|
const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
|
|
74
58
|
let incrReply;
|
|
75
|
-
// const useMongoBySettings = await this.useMongoBySettings(params);
|
|
76
59
|
dataFeedExpires = moment(params.orderDate)
|
|
77
60
|
.add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
|
|
78
61
|
.toDate();
|
|
@@ -82,14 +65,18 @@ class OrderNumberRepo {
|
|
|
82
65
|
expires: dataFeedExpires
|
|
83
66
|
});
|
|
84
67
|
let orderNumber;
|
|
85
|
-
|
|
86
|
-
const useVersioning = (validFrom instanceof Date && moment(validFrom)
|
|
68
|
+
let useVersioning = (validFrom instanceof Date && moment(validFrom)
|
|
87
69
|
.isSameOrBefore(params.orderDate))
|
|
70
|
+
// versioningForceProjectsであれば強制的にversioning(2026-02-05~)
|
|
88
71
|
|| versioningForceProjects.includes(projectPrefix);
|
|
72
|
+
// versioningExceptionProjectsであれば強制的にversioning不使用(2026-02-10~)
|
|
73
|
+
if (versioningExceptionProjects.includes(projectPrefix)) {
|
|
74
|
+
useVersioning = false;
|
|
75
|
+
}
|
|
89
76
|
if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
|
|
90
77
|
const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
|
|
91
78
|
orderNumber = transactionFactory.generate(timestamp, incrReply);
|
|
92
|
-
orderNumber = `${projectPrefix.at(0)}${orderNumber}`;
|
|
79
|
+
orderNumber = `${projectPrefix.at(0)}${orderNumber}`; // 桁数をversion0に合わせるためにエイリアスの1文字目のみを採用
|
|
93
80
|
orderNumber = `${[
|
|
94
81
|
// tslint:disable-next-line:no-magic-numbers
|
|
95
82
|
orderNumber.slice(0, 4),
|
|
@@ -102,12 +89,6 @@ class OrderNumberRepo {
|
|
|
102
89
|
else {
|
|
103
90
|
orderNumber = OrderNumberRepo.GENERATE_VERSION0(timestamp, incrReply);
|
|
104
91
|
orderNumber = `${projectPrefix}${orderNumber}`;
|
|
105
|
-
// orderNumber = `${timestamp}${incrReply}`;
|
|
106
|
-
// // checkdigit
|
|
107
|
-
// const cd = cdigit.luhn.compute(orderNumber);
|
|
108
|
-
// orderNumber = fpe({ password: cd })
|
|
109
|
-
// .encrypt(orderNumber);
|
|
110
|
-
// orderNumber = `${projectPrefix}${cd}${orderNumber}`;
|
|
111
92
|
orderNumber = `${[
|
|
112
93
|
// tslint:disable-next-line:no-magic-numbers
|
|
113
94
|
orderNumber.slice(0, 4),
|
|
@@ -135,6 +116,9 @@ class OrderNumberRepo {
|
|
|
135
116
|
}
|
|
136
117
|
});
|
|
137
118
|
}
|
|
119
|
+
/**
|
|
120
|
+
* 注文番号生成設定を検索する
|
|
121
|
+
*/
|
|
138
122
|
findSetting() {
|
|
139
123
|
return __awaiter(this, void 0, void 0, function* () {
|
|
140
124
|
const filterQuery = { 'project.id': { $eq: '*' } };
|
|
@@ -146,9 +130,12 @@ class OrderNumberRepo {
|
|
|
146
130
|
.lean()
|
|
147
131
|
.exec();
|
|
148
132
|
if (setting === null || setting.orderNumber === undefined) {
|
|
149
|
-
return {
|
|
133
|
+
return {
|
|
134
|
+
versioningForceProjects: [],
|
|
135
|
+
versioningExceptionProjects: []
|
|
136
|
+
};
|
|
150
137
|
}
|
|
151
|
-
const { fpeSecret, version, validFrom, versioningForceProjects } = setting.orderNumber;
|
|
138
|
+
const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = setting.orderNumber;
|
|
152
139
|
if (typeof fpeSecret !== 'string' || fpeSecret === '') {
|
|
153
140
|
throw new factory.errors.NotFound('setting.orderNumber.secret');
|
|
154
141
|
}
|
|
@@ -163,7 +150,8 @@ class OrderNumberRepo {
|
|
|
163
150
|
versioningForceProjects: [
|
|
164
151
|
...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : [],
|
|
165
152
|
...defaultVersioningForceProjects
|
|
166
|
-
]
|
|
153
|
+
],
|
|
154
|
+
versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
|
|
167
155
|
};
|
|
168
156
|
});
|
|
169
157
|
}
|
|
@@ -10,10 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.TransactionNumberRepo = void 0;
|
|
13
|
-
const cdigit = require("cdigit");
|
|
14
13
|
const moment = require("moment-timezone");
|
|
15
|
-
// tslint:disable-next-line:no-require-imports no-var-requires
|
|
16
|
-
const fpe1 = require('node-fpe-v1');
|
|
17
14
|
const factory = require("../factory");
|
|
18
15
|
const transactionNumber_1 = require("../factory/transactionNumber");
|
|
19
16
|
const setting_1 = require("./mongoose/schemas/setting");
|
|
@@ -39,7 +36,6 @@ class TransactionNumberRepo {
|
|
|
39
36
|
let dataFeedExpires;
|
|
40
37
|
const dataFeedIdentifier = timestamp;
|
|
41
38
|
let incrReply;
|
|
42
|
-
// const useMongoBySettings = await this.useMongoBySettings(params);
|
|
43
39
|
dataFeedExpires = moment(params.startDate)
|
|
44
40
|
.add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
|
|
45
41
|
.toDate();
|
|
@@ -56,12 +52,14 @@ class TransactionNumberRepo {
|
|
|
56
52
|
transactionNumber = transactionFactory.generate(timestamp, incrReply);
|
|
57
53
|
}
|
|
58
54
|
else {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
transactionNumber =
|
|
55
|
+
// discontinue version0(2026-02-10~)
|
|
56
|
+
throw new factory.errors.NotImplemented('transactionNumber with no version discontinued');
|
|
57
|
+
// transactionNumber = `${timestamp}${incrReply}`;
|
|
58
|
+
// // checkdigit
|
|
59
|
+
// const cd = cdigit.luhn.compute(transactionNumber);
|
|
60
|
+
// transactionNumber = fpe1({ password: cd })
|
|
61
|
+
// .encrypt(transactionNumber);
|
|
62
|
+
// transactionNumber = `${cd}${transactionNumber}`;
|
|
65
63
|
}
|
|
66
64
|
return { transactionNumber, timestamp, incrReply };
|
|
67
65
|
});
|
package/package.json
CHANGED