@chevre/domain 21.32.0-alpha.8 → 21.32.0

package/lib/chevre/repo/confirmationNumber.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisRepository = void 0;
+exports.ConfirmationNumberRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
 const util = require("util");
@@ -20,7 +20,7 @@ const CONFIRMATION_NUMBER_MIN_LENGH = 4;
 /**
  * 確認番号リポジトリ
  */
-class RedisRepository {
+class ConfirmationNumberRepo {
     constructor(redisClient) {
         this.redisClient = redisClient;
     }
@@ -33,7 +33,7 @@ class RedisRepository {
         return aligndNumber;
     }
     static createKey(params) {
-        return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX_NEW, moment(params.orderDate)
+        return util.format('%s:%s', ConfirmationNumberRepo.REDIS_KEY_PREFIX_NEW, moment(params.orderDate)
             .tz('Asia/Tokyo')
             .format('YYMM'));
     }
@@ -46,7 +46,7 @@ class RedisRepository {
             const TTL = moment(params.orderDate)
                 .add(1, 'month')
                 .diff(moment(params.orderDate), 'seconds');
-            const key = RedisRepository.createKey({ orderDate: params.orderDate });
+            const key = ConfirmationNumberRepo.createKey({ orderDate: params.orderDate });
             const [incrReply] = yield this.redisClient.multi()
                 .incr(key)
                 .expire(key, TTL)
@@ -58,7 +58,7 @@ class RedisRepository {
                 throw new factory.errors.ServiceUnavailable('confirmation number not incremented unexpectedly');
             }
             // 桁数調整
-            let confirmationNumber = RedisRepository.alignDigits(incrReply);
+            let confirmationNumber = ConfirmationNumberRepo.alignDigits(incrReply);
             // checkdigit
             const cd = cdigit.luhn.compute(confirmationNumber);
             // debug('check digit:', cd);
@@ -69,5 +69,5 @@ class RedisRepository {
         });
     }
 }
-RedisRepository.REDIS_KEY_PREFIX_NEW = 'confirmationNumber';
-exports.RedisRepository = RedisRepository;
+ConfirmationNumberRepo.REDIS_KEY_PREFIX_NEW = 'confirmationNumber';
+exports.ConfirmationNumberRepo = ConfirmationNumberRepo;

package/lib/chevre/repo/mongoose/schemas/action.js

@@ -27,7 +27,8 @@ const schemaDefinition = {
     location: mongoose_1.SchemaTypes.Mixed,
     replacer: mongoose_1.SchemaTypes.Mixed,
     targetCollection: mongoose_1.SchemaTypes.Mixed,
-    sameAs: mongoose_1.SchemaTypes.Mixed // タスク関連付けのために追加(2024-04-20~)
+    sameAs: mongoose_1.SchemaTypes.Mixed,
+    cancelAction: mongoose_1.SchemaTypes.Mixed // add(2024-05-26~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/repo/mongoose/schemas/aggregation.js

@@ -16,10 +16,8 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: false,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,
@@ -44,14 +42,5 @@ function createSchema() {
     return schema;
 }
 exports.createSchema = createSchema;
-const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ]
-];
+const indexes = [];
 exports.indexes = indexes;

package/lib/chevre/repo/mongoose/schemas/task.js

@@ -33,10 +33,8 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,
@@ -51,14 +49,6 @@ const schemaOptions = {
     }
 };
 const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ],
     [
         { 'project.id': 1, runsAt: -1 },
         { name: 'searchByProjectId-v20220721' }

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

@@ -168,6 +168,10 @@ export declare class MongoRepository {
         };
     }): Promise<number>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
     aggregateTask(params: {
         project?: {
             id?: {

package/lib/chevre/repo/task.js

@@ -645,6 +645,12 @@ class MongoRepository {
             .sort({ runsAt: factory.sortType.Ascending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.taskModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
     aggregateTask(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

package/lib/chevre/repository.d.ts

@@ -61,7 +61,7 @@ import type { MongoRepository as TransactionRepo } from './repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from './repo/transactionNumber';
 import type { TransactionProcessRepository } from './repo/transactionProcess';
 import type { MongoRepository as TripRepo } from './repo/trip';
-import type { RedisRepository as ConfirmationNumberRepo } from './repo/confirmationNumber';
+import type { ConfirmationNumberRepo } from './repo/confirmationNumber';
 import type { RedisRepository as OrderNumberRepo } from './repo/orderNumber';
 import type { GMORepository as CreditCardRepo } from './repo/paymentMethod/creditCard';
 import type { CognitoRepository as PersonRepo } from './repo/person';

package/lib/chevre/repository.js

@@ -199,7 +199,7 @@ var ConfirmationNumber;
     function createInstance(...params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (repo === undefined) {
-                repo = (yield Promise.resolve().then(() => require('./repo/confirmationNumber'))).RedisRepository;
+                repo = (yield Promise.resolve().then(() => require('./repo/confirmationNumber'))).ConfirmationNumberRepo;
             }
             return new repo(...params);
         });

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -76,8 +76,20 @@ export type IPublishPaymentUrlResult = CreditCardPayment.IPaymentAgencyTransacti
 /**
  * 外部決済ロケーション発行
  */
-export declare function publishPaymentUrl(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, purposeAsTransaction?: {
-    id: string;
+export declare function publishPaymentUrl(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, options: {
+    purposeAsTransaction: {
+        id: string;
+    };
+    /**
+     * 実行者
+     */
+    executor?: {
+        /**
+         * task ID
+         * taskによって実行されている場合値が存在する
+         */
+        id?: string;
+    };
 }): IPublishPaymentUrlOperation<IPublishPaymentUrlResult>;
 /**
  * 決済ロケーションを無効化する

package/lib/chevre/service/assetTransaction/pay.js

@@ -23,9 +23,9 @@ const debug = createDebug('chevre-domain:service:assetTransaction');
  * 外部決済ロケーション発行
  */
 // tslint:disable-next-line:max-func-body-length
-function publishPaymentUrl(params, purposeAsTransaction) {
+function publishPaymentUrl(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const paymentServiceType = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf;
         // 金額をfix
         const amount = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount;
@@ -40,22 +40,26 @@ function publishPaymentUrl(params, purposeAsTransaction) {
         // 決済サービス確認
         const paymentServiceId = getPaymentServiceId(params);
         // 決済受入アクション生成(2024-03-28~)
+        const taskId = (_c = options === null || options === void 0 ? void 0 : options.executor) === null || _c === void 0 ? void 0 : _c.id;
         const actionAttributes = Object.assign({ project: params.project, typeOf: factory.actionType.AcceptAction, agent: params.agent, object: {
                 object: params.object,
                 transactionNumber,
                 typeOf: params.typeOf
-            } }, (typeof (purposeAsTransaction === null || purposeAsTransaction === void 0 ? void 0 : purposeAsTransaction.id) === 'string')
-            ? { purpose: { typeOf: factory.transactionType.PlaceOrder, id: purposeAsTransaction.id } }
+            }, purpose: { typeOf: factory.transactionType.PlaceOrder, id: options.purposeAsTransaction.id } }, (typeof taskId === 'string')
+            ? { sameAs: { id: taskId, typeOf: 'Task' } } // タスク関連付け(2024-05-22~)
             : undefined);
         const action = yield repos.action.start(actionAttributes);
         let result;
         try {
             switch (paymentServiceType) {
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
-                    const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { processPublishPaymentUrl: true })(repos);
+                    const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, {
+                        processPublishPaymentUrl: true,
+                        executor: (typeof ((_d = options.executor) === null || _d === void 0 ? void 0 : _d.id) === 'string') ? { id: options.executor.id } : {} // タスク関連付け(2024-05-22~)
+                    })(repos);
                     let paymentUrl;
                     // 3DS拡張(2024-01-02~)
-                    const retUrl = (_c = params.object.paymentMethod.creditCard) === null || _c === void 0 ? void 0 : _c.retUrl;
+                    const retUrl = (_e = params.object.paymentMethod.creditCard) === null || _e === void 0 ? void 0 : _e.retUrl;
                     if (typeof retUrl === 'string' && retUrl.length > 0) {
                         paymentUrl = authorizeResult.execTranResult.redirectUrl;
                     }

package/lib/chevre/service/code.d.ts

@@ -51,5 +51,5 @@ declare function verifyToken(params: {
     action?: ActionRepo;
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
-}) => Promise<factory.authorization.IObject | import("@chevre/factory/lib/action/authorize/offer/eventService").IPurpose>;
+}) => Promise<factory.authorization.IObject | import("@chevre/factory/lib/action/accept/coaOffer").IPurpose>;
 export { IToken, ICode, IPayload, IPayloadWithNoVersion, getToken, verifyToken };

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -77,8 +77,6 @@ declare function authorize(params: {
      * オファーID指定なしに座席をおさえる場合true
      */
     noOfferSpecified: boolean;
-    options: {
-        useCreateOrderOnOfferAccepted: boolean;
-    };
+    options: {};
 }): IAuthorizeOperation<IAuthorizeOfferAction>;
 export { authorize };

package/lib/chevre/service/offer/event/authorize.js

@@ -71,13 +71,13 @@ function authorize(params) {
                     acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
                     // add orderInTransaction(2024-01-15~)
                     if (!noOfferSpecified) {
-                        if (params.options.useCreateOrderOnOfferAccepted) {
-                            yield (0, any_1.acceptOffer)({
-                                project: transaction.project,
-                                purpose: { id: transaction.id },
-                                acceptedOffers: acceptedOffers4result
-                            })(repos);
-                        }
+                        // if (params.options.useCreateOrderOnOfferAccepted) {
+                        yield (0, any_1.acceptOffer)({
+                            project: transaction.project,
+                            purpose: { id: transaction.id },
+                            acceptedOffers: acceptedOffers4result
+                        })(repos);
+                        // }
                     }
                     break;
                 default:

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.d.ts

@@ -0,0 +1,24 @@
+import * as factory from '../../../../factory';
+import type { MongoRepository as ActionRepo } from '../../../../repo/action';
+import type { MongoRepository as AssetTransactionRepo } from '../../../../repo/assetTransaction';
+import type { MongoRepository as OrderInTransactionRepo } from '../../../../repo/orderInTransaction';
+import type { RedisRepository as OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
+import type { MongoRepository as ReservationRepo } from '../../../../repo/reservation';
+import type { StockHolderRepository as StockHolderRepo } from '../../../../repo/stockHolder';
+import type { MongoRepository as TaskRepo } from '../../../../repo/task';
+import type { MongoRepository as TransactionRepo } from '../../../../repo/transaction';
+export import WebAPIIdentifier = factory.service.webAPI.Identifier;
+interface IVoidTransactionRepos {
+    action: ActionRepo;
+    assetTransaction: AssetTransactionRepo;
+    stockHolder: StockHolderRepo;
+    offerRateLimit: OfferRateLimitRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    reservation: ReservationRepo;
+    task: TaskRepo;
+    transaction: TransactionRepo;
+}
+declare function processVoidTransaction4chevre(params: {
+    action: factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.Chevre>;
+}): (repos: IVoidTransactionRepos) => Promise<void>;
+export { processVoidTransaction4chevre };

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.js

@@ -0,0 +1,35 @@
+"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.processVoidTransaction4chevre = exports.WebAPIIdentifier = void 0;
+const factory = require("../../../../factory");
+const reserve_1 = require("../../../assetTransaction/reserve");
+exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
+function processVoidTransaction4chevre(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const transactionNumber = (_a = params.action.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.transactionNumber;
+        if (typeof transactionNumber === 'string') {
+            // 取引が存在すれば中止
+            const assetTransactions = yield repos.assetTransaction.search({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.action.project.id } },
+                typeOf: factory.assetTransactionType.Reserve,
+                transactionNumber: { $eq: transactionNumber }
+            }, ['_id']);
+            if (assetTransactions.length > 0) {
+                yield (0, reserve_1.cancel)({ transactionNumber })(repos);
+            }
+        }
+    });
+}
+exports.processVoidTransaction4chevre = processVoidTransaction4chevre;

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4coa.d.ts

@@ -0,0 +1,9 @@
+import * as factory from '../../../../factory';
+export import WebAPIIdentifier = factory.service.webAPI.Identifier;
+declare function processVoidTransaction4coa(params: {
+    action: factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.COA>;
+}): Promise<void>;
+declare function processVoidTransactionByAcceptAction4coa(params: {
+    action: factory.action.accept.coaOffer.IAction;
+}): Promise<void>;
+export { processVoidTransaction4coa, processVoidTransactionByAcceptAction4coa };

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4coa.js

@@ -0,0 +1,130 @@
+"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.processVoidTransactionByAcceptAction4coa = exports.processVoidTransaction4coa = exports.WebAPIIdentifier = void 0;
+const COA = require("@motionpicture/coa-service");
+const http_status_1 = require("http-status");
+const credentials_1 = require("../../../../credentials");
+const factory = require("../../../../factory");
+const coaAuthClient = new COA.auth.RefreshToken({
+    endpoint: credentials_1.credentials.coa.endpoint,
+    refreshToken: credentials_1.credentials.coa.refreshToken,
+    useFetch: credentials_1.credentials.coa.useFetch
+});
+exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
+function processVoidTransaction4coa(params) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        // COAの場合、objectあるいはresultに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
+        let delTmpReserveParams;
+        // objectに進行中取引情報があれば利用する(2023-09-11~)
+        const pendingTransaction = params.action.object.pendingTransaction;
+        if (typeof (pendingTransaction === null || pendingTransaction === void 0 ? void 0 : pendingTransaction.typeOf) === 'string') {
+            delTmpReserveParams = {
+                theaterCode: pendingTransaction.theaterCode,
+                dateJouei: pendingTransaction.dateJouei,
+                titleCode: pendingTransaction.titleCode,
+                titleBranchNum: pendingTransaction.titleBranchNum,
+                timeBegin: pendingTransaction.timeBegin,
+                tmpReserveNum: pendingTransaction.tmpReserveNum
+            };
+        }
+        else {
+            const coaRequestBody = (_a = params.action.result) === null || _a === void 0 ? void 0 : _a.requestBody;
+            const coaResponseBody = (_b = params.action.result) === null || _b === void 0 ? void 0 : _b.responseBody;
+            if (coaRequestBody !== undefined && coaResponseBody !== undefined) {
+                delTmpReserveParams = {
+                    theaterCode: coaRequestBody.theaterCode,
+                    dateJouei: coaRequestBody.dateJouei,
+                    titleCode: coaRequestBody.titleCode,
+                    titleBranchNum: coaRequestBody.titleBranchNum,
+                    timeBegin: coaRequestBody.timeBegin,
+                    tmpReserveNum: coaResponseBody.tmpReserveNum
+                };
+            }
+        }
+        if (delTmpReserveParams !== undefined) {
+            // COAで仮予約取消
+            try {
+                const reserveService = new COA.service.Reserve({
+                    endpoint: credentials_1.credentials.coa.endpoint,
+                    auth: coaAuthClient
+                }, { timeout: credentials_1.credentials.coa.timeout });
+                yield reserveService.delTmpReserve(delTmpReserveParams);
+            }
+            catch (error) {
+                let deleted = false;
+                // COAサービスエラーの場合ハンドリング
+                // tslint:disable-next-line:no-single-line-block-comment
+                /* istanbul ignore if */
+                if (error.name === 'COAServiceError') {
+                    if (typeof error.code === 'number' && error.code < http_status_1.INTERNAL_SERVER_ERROR) {
+                        // すでに取消済の場合こうなるので、okとする
+                        if (error.message === '座席取消失敗') {
+                            deleted = true;
+                        }
+                    }
+                }
+                if (!deleted) {
+                    throw error;
+                }
+            }
+        }
+    });
+}
+exports.processVoidTransaction4coa = processVoidTransaction4coa;
+function processVoidTransactionByAcceptAction4coa(params) {
+    var _a, _b, _c;
+    return __awaiter(this, void 0, void 0, function* () {
+        // instrument,resultに連携内容情報が保管されているので、その情報を元に仮予約を取り消す
+        let delTmpReserveParams;
+        const coaRequestBody = (_a = params.action.instrument) === null || _a === void 0 ? void 0 : _a.requestBody;
+        const coaResponseBody = (_c = (_b = params.action.result) === null || _b === void 0 ? void 0 : _b.result) === null || _c === void 0 ? void 0 : _c.responseBody;
+        if (coaRequestBody !== undefined && coaResponseBody !== undefined) {
+            delTmpReserveParams = {
+                theaterCode: coaRequestBody.theaterCode,
+                dateJouei: coaRequestBody.dateJouei,
+                titleCode: coaRequestBody.titleCode,
+                titleBranchNum: coaRequestBody.titleBranchNum,
+                timeBegin: coaRequestBody.timeBegin,
+                tmpReserveNum: coaResponseBody.tmpReserveNum
+            };
+        }
+        if (delTmpReserveParams !== undefined) {
+            // COAで仮予約取消
+            try {
+                const reserveService = new COA.service.Reserve({
+                    endpoint: credentials_1.credentials.coa.endpoint,
+                    auth: coaAuthClient
+                }, { timeout: credentials_1.credentials.coa.timeout });
+                yield reserveService.delTmpReserve(delTmpReserveParams);
+            }
+            catch (error) {
+                let deleted = false;
+                // COAサービスエラーの場合ハンドリング
+                // tslint:disable-next-line:no-single-line-block-comment
+                /* istanbul ignore if */
+                if (error.name === 'COAServiceError') {
+                    if (typeof error.code === 'number' && error.code < http_status_1.INTERNAL_SERVER_ERROR) {
+                        // すでに取消済の場合こうなるので、okとする
+                        if (error.message === '座席取消失敗') {
+                            deleted = true;
+                        }
+                    }
+                }
+                if (!deleted) {
+                    throw error;
+                }
+            }
+        }
+    });
+}
+exports.processVoidTransactionByAcceptAction4coa = processVoidTransactionByAcceptAction4coa;

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -19,8 +19,15 @@ interface IVoidTransactionRepos {
     transaction: TransactionRepo;
 }
 /**
- * 興行オファー承認取消(タスクから実行)
- * 取引中の承認アクション全てについて処理する
+ * 興行オファー承認取消(タスクから実行 or apiから実行))
+ * 取引中の承認アクション全てについて処理する or 特定の承認アクションについて処理する
  */
-export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidReserveTransaction>): (repos: IVoidTransactionRepos) => Promise<void>;
+export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidReserveTransaction> & {
+    sameAs?: {
+        /**
+         * 実行元タスクID
+         */
+        id: string;
+    };
+}): (repos: IVoidTransactionRepos) => Promise<void>;
 export {};