@chevre/domain 23.2.0-alpha.9 → 23.2.0

package/lib/chevre/repo/serviceOutputIdentifier.js

@@ -1,70 +1,99 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceOutputIdentifierRepo = void 0;
-const cdigit = require("cdigit");
-const moment = require("moment-timezone");
-// import { RedisClientType } from 'redis';
-// tslint:disable-next-line:no-require-imports no-var-requires
-const fpe = require('node-fpe');
-// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
-const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
+// import * as cdigit from 'cdigit';
+const moment_timezone_1 = __importDefault(require("moment-timezone"));
+// const fpe = require('node-fpe-v1');
+const factory = __importStar(require("../factory"));
+const transactionNumber_1 = require("../factory/transactionNumber");
+const setting_1 = require("./mongoose/schemas/setting");
+const transactionNumber_2 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 /**
  * サービスアウトプット識別子リポジトリ
  */
 class ServiceOutputIdentifierRepo {
+    counterRepo;
+    settingModel;
     constructor(params) {
-        // const { connection } = params;
-        // this.settingModel = connection.model(settingModelName, createSettingSchema());
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
+        this.settingModel = params.connection.model(setting_1.modelName, (0, setting_1.createSchema)());
     }
-    // private static createKey(params: {
-    //     startDate: Date;
-    //     timestamp: string;
-    // }): string {
-    //     return util.format(
-    //         '%s:%s',
-    //         ServiceOutputIdentifierRepo.REDIS_KEY_PREFIX,
-    //         params.timestamp
-    //     );
-    // }
     /**
      * タイムスタンプから発行する
      */
-    publishByTimestamp(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const timestamp = moment(params.startDate)
-                .valueOf()
-                .toString();
-            let dataFeedExpires;
-            const dataFeedIdentifier = timestamp;
-            let incrReply;
-            // const useMongoBySettings = await this.useMongoBySettings(params);
-            dataFeedExpires = moment(params.startDate)
-                .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                .toDate();
-            incrReply = yield this.counterRepo.incrementByMongo({
-                identifier: dataFeedIdentifier,
-                includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.serviceOutputIdentifier },
-                expires: dataFeedExpires
-            });
-            let identifier = `${timestamp}${incrReply}`;
-            // checkdigit
-            const cd = cdigit.luhn.compute(identifier);
-            identifier = fpe({ password: cd })
-                .encrypt(identifier);
-            identifier = `${cd}${identifier}`;
-            return identifier;
+    async issueServiceOutputIdentifier(params) {
+        const { fpeSecret, version } = await this.findSetting();
+        const timestamp = (0, moment_timezone_1.default)(params.startDate)
+            .valueOf()
+            .toString();
+        let dataFeedExpires;
+        const dataFeedIdentifier = timestamp;
+        let incrReply;
+        dataFeedExpires = (0, moment_timezone_1.default)(params.startDate)
+            .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
+            .toDate();
+        incrReply = await this.counterRepo.incrementByMongo({
+            identifier: dataFeedIdentifier,
+            includedInDataCatalog: { identifier: transactionNumber_2.DataCatalogIdentifier.serviceOutputIdentifier },
+            expires: dataFeedExpires
         });
+        const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
+        return transactionFactory.generate(timestamp, incrReply);
+        // let identifier: string = `${timestamp}${incrReply}`;
+        // // checkdigit
+        // const cd = cdigit.luhn.compute(identifier);
+        // identifier = fpe({ password: cd })
+        //     .encrypt(identifier);
+        // identifier = `${cd}${identifier}`;
+        // return identifier;
+    }
+    async findSetting() {
+        const filterQuery = { 'project.id': { $eq: '*' } };
+        const projection = {
+            _id: 0,
+            serviceOutputIdentifier: 1
+        };
+        const setting = await this.settingModel.findOne(filterQuery, projection)
+            .lean()
+            .exec();
+        if (setting === null || setting.serviceOutputIdentifier === undefined) {
+            throw new factory.errors.NotFound('setting.serviceOutputIdentifier');
+        }
+        const { fpeSecret, version } = setting.serviceOutputIdentifier;
+        if (typeof fpeSecret !== 'string' || fpeSecret === '') {
+            throw new factory.errors.NotFound('setting.serviceOutputIdentifier.secret');
+        }
+        if (typeof version !== 'string' || version === '') {
+            throw new factory.errors.NotFound('setting.serviceOutputIdentifier.version');
+        }
+        return { fpeSecret, version };
     }
 }
 exports.ServiceOutputIdentifierRepo = ServiceOutputIdentifierRepo;

package/lib/chevre/repo/setting/jwt.js

@@ -1,65 +1,78 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JWTSettingRepo = void 0;
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 const setting_1 = require("../mongoose/schemas/setting");
 /**
  * JWT設定リポジトリ
  */
 class JWTSettingRepo {
+    settingModel;
     constructor(connection) {
         this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
     }
-    findDefault() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const andQuery = [{ 'project.id': { $eq: '*' } }];
-            const filterQuery = { $and: andQuery };
-            const projection = {
-                _id: 0,
-                // id: { $toString: '$_id' },
-                jwt: 1
-            };
-            const jwtSetting = yield this.settingModel.findOne(filterQuery, projection)
-                .lean()
-                .exec();
-            if (jwtSetting === null || jwtSetting.jwt === undefined) {
-                throw new factory.errors.NotFound('setting.jwt');
-            }
-            const { secret, version, payloadTypPrefix, issuers, issueEndpoint, issuer, algorithm } = jwtSetting.jwt;
-            if (typeof secret !== 'string' || secret.length === 0) {
-                throw new factory.errors.NotFound('setting.jwt.secret');
-            }
-            if (typeof version !== 'string' || version.length === 0) {
-                throw new factory.errors.NotFound('setting.jwt.version');
-            }
-            if (typeof payloadTypPrefix !== 'string' || payloadTypPrefix.length === 0) {
-                throw new factory.errors.NotFound('setting.jwt.payloadTypPrefix');
-            }
-            if (typeof issueEndpoint !== 'string' || issueEndpoint.length === 0) {
-                throw new factory.errors.NotFound('setting.jwt.issueEndpoint');
-            }
-            if (typeof issuer !== 'string' || issuer.length === 0) {
-                throw new factory.errors.NotFound('setting.jwt.issuer');
-            }
-            if (typeof algorithm !== 'string' || algorithm.length === 0) {
-                throw new factory.errors.NotFound('setting.jwt.algorithm');
-            }
-            if (!Array.isArray(issuers)) {
-                throw new factory.errors.NotFound('setting.jwt.issuers');
-            }
-            return {
-                secret, version, payloadTypPrefix, issuers, issueEndpoint, issuer, algorithm
-            };
-        });
+    async findDefault() {
+        const andQuery = [{ 'project.id': { $eq: '*' } }];
+        const filterQuery = { $and: andQuery };
+        const projection = {
+            _id: 0,
+            // id: { $toString: '$_id' },
+            jwt: 1
+        };
+        const jwtSetting = await this.settingModel.findOne(filterQuery, projection)
+            .lean()
+            .exec();
+        if (jwtSetting === null || jwtSetting.jwt === undefined) {
+            throw new factory.errors.NotFound('setting.jwt');
+        }
+        const { secret, version, payloadTypPrefix, issuers, issueEndpoint, issuer, algorithm } = jwtSetting.jwt;
+        if (typeof secret !== 'string' || secret.length === 0) {
+            throw new factory.errors.NotFound('setting.jwt.secret');
+        }
+        if (typeof version !== 'string' || version.length === 0) {
+            throw new factory.errors.NotFound('setting.jwt.version');
+        }
+        if (typeof payloadTypPrefix !== 'string' || payloadTypPrefix.length === 0) {
+            throw new factory.errors.NotFound('setting.jwt.payloadTypPrefix');
+        }
+        if (typeof issueEndpoint !== 'string' || issueEndpoint.length === 0) {
+            throw new factory.errors.NotFound('setting.jwt.issueEndpoint');
+        }
+        if (typeof issuer !== 'string' || issuer.length === 0) {
+            throw new factory.errors.NotFound('setting.jwt.issuer');
+        }
+        if (typeof algorithm !== 'string' || algorithm.length === 0) {
+            throw new factory.errors.NotFound('setting.jwt.algorithm');
+        }
+        if (!Array.isArray(issuers)) {
+            throw new factory.errors.NotFound('setting.jwt.issuers');
+        }
+        return {
+            secret, version, payloadTypPrefix, issuers, issueEndpoint, issuer, algorithm
+        };
     }
 }
 exports.JWTSettingRepo = JWTSettingRepo;

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

@@ -22,7 +22,7 @@ export declare class SettingRepo {
                 $eq: string;
             };
         };
-    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onTaskStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onTaskStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter' | 'orderNumber' | 'transactionNumber'>): Promise<import("mongoose").UpdateWriteOpResult>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<ISetting>;
         $unset: any;

package/lib/chevre/repo/setting.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SettingRepo = void 0;
 // import * as factory from '../factory';
@@ -16,51 +7,60 @@ const setting_1 = require("./mongoose/schemas/setting");
  * 設定リポジトリ
  */
 class SettingRepo {
+    settingModel;
     constructor(connection) {
         this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
     }
-    saveOne(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.settingModel.create(params);
-        });
+    async saveOne(params) {
+        await this.settingModel.create(params);
     }
-    findOne(filter, inclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const andQuery = [];
-            const projectIdEq = (_b = (_a = filter.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
-            if (typeof projectIdEq === 'string') {
-                andQuery.push({ 'project.id': { $eq: projectIdEq } });
-            }
-            const filterQuery = Object.assign({}, (andQuery.length > 0) ? { $and: andQuery } : undefined);
-            const projection = {
-                _id: 0
-                // id: { $toString: '$_id' },
-            };
-            if (Array.isArray(inclusion)) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
-            }
-            return this.settingModel.findOne(filterQuery, projection)
-                .lean()
-                .exec();
-        });
+    async findOne(filter, inclusion) {
+        const andQuery = [];
+        const projectIdEq = filter.project?.id?.$eq;
+        if (typeof projectIdEq === 'string') {
+            andQuery.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const filterQuery = {
+            ...(andQuery.length > 0) ? { $and: andQuery } : undefined
+        };
+        const projection = {
+            _id: 0
+            // id: { $toString: '$_id' },
+        };
+        if (Array.isArray(inclusion)) {
+            inclusion.forEach((field) => {
+                projection[field] = 1;
+            });
+        }
+        return this.settingModel.findOne(filterQuery, projection)
+            .lean()
+            .exec();
     }
-    updateByProject(filter, update) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { onEventChanged, onReservationStatusChanged, onTaskStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter } = update;
-            return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
-                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onTaskStatusChanged !== undefined) ? { onTaskStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined), (storage !== undefined) ? { storage } : undefined), (quota !== undefined) ? { quota } : undefined), (triggerWebhook !== undefined) ? { triggerWebhook } : undefined), (waiter !== undefined) ? { waiter } : undefined)
-            })
-                .exec();
-        });
+    async updateByProject(filter, update) {
+        const { onEventChanged, onReservationStatusChanged, onTaskStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter, orderNumber, transactionNumber } = update;
+        return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
+            $set: {
+                ...(onEventChanged !== undefined) ? { onEventChanged } : undefined,
+                ...(onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined,
+                ...(onTaskStatusChanged !== undefined) ? { onTaskStatusChanged } : undefined,
+                ...(onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined,
+                ...(defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined,
+                ...(useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined,
+                ...(userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined,
+                ...(userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined,
+                ...(storage !== undefined) ? { storage } : undefined,
+                ...(quota !== undefined) ? { quota } : undefined,
+                ...(triggerWebhook !== undefined) ? { triggerWebhook } : undefined,
+                ...(waiter !== undefined) ? { waiter } : undefined,
+                ...(orderNumber !== undefined) ? { orderNumber } : undefined,
+                ...(transactionNumber !== undefined) ? { transactionNumber } : undefined
+            }
+        })
+            .exec();
     }
-    unsetUnnecessaryFields(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.settingModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
-                .exec();
-        });
+    async unsetUnnecessaryFields(params) {
+        return this.settingModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+            .exec();
     }
 }
 exports.SettingRepo = SettingRepo;