@chevre/domain 22.2.0-alpha.23 → 22.2.0-alpha.24

package/example/src/chevre/projectFields.ts

@@ -12,19 +12,29 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const transactionrRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
 
-    const docs = await transactionrRepo.projectFields(
+    const docs = await actionRepo.search(
         {
             limit: 1,
             page: 1,
-            typeOf: chevre.factory.transactionType.PlaceOrder,
-            inclusion: ['startDate']
-        }
+            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction }
+        },
+        ['id', 'typeOf', 'actionStatus'],
+        ['result', 'cancelAction', 'instrument', 'object']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(docs, { depth: null });
     console.log(docs.length, 'docs found');
+
+    const actions = await actionRepo.searchByOrderNumber(
+        {
+            orderNumber: 'CIN9-4893721-9248784'
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(actions, { depth: null });
+    console.log(actions.length, 'actions found');
 }
 
 main()

package/example/src/chevre/projectFieldsById.ts

@@ -11,18 +11,18 @@ console.log(`importing chevre took ${diff[0]} seconds and ${diff[1]} nanoseconds
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const transactionrRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
 
-    const transaction = await transactionrRepo.projectFieldsById(
+    const doc = await actionRepo.findById(
         {
-            // id: '120162210202407171202250'
-            id: '66c6a1bb261e960547f8e138',
-            typeOf: chevre.factory.transactionType.PlaceOrder
+            id: '66cc6030fe3d4df76011aa75',
+            typeOf: chevre.factory.actionType.DeleteAction
         },
-        ['startDate']
+        ['id', 'actionStatus'],
+        []
     );
     // tslint:disable-next-line:no-null-keyword
-    console.dir(transaction, { depth: null });
+    console.dir(doc, { depth: null });
 }
 
 main()

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

@@ -25,13 +25,16 @@
 import { factory as surfrockFactory } from '@surfrock/sdk';
 import { Connection, Document, FilterQuery, QueryOptions, UpdateQuery } from 'mongoose';
 import * as factory from '../factory';
-export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction<factory.action.update.replace.IAttributes<any, any>> : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
+export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> & {
+    cancelAction?: any;
+} : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction<factory.action.update.replace.IAttributes<any, any>> & {
+    targetCollection?: any;
+} : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
 export type IPayAction = factory.action.trade.pay.IAction;
 export interface IUseActionCountByOffer {
     _id: string[];
     useActionCount?: number;
 }
-type KeyOfAction = keyof factory.action.IAction<factory.action.IAttributes<factory.actionType, any, any>> | '_id';
 interface IAggregationByStatus {
     actionCount: number;
     avgDuration: number;
@@ -72,6 +75,7 @@ export type IRecipeAsActionAttributes = Pick<factory.recipe.IRecipe, 'project' |
 export type IMinimizedPurchaseNumberAuthResult = Pick<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult, 'mkknmiNumSum' | 'resultInfo' | 'ykknmiNumSum'> & {
     knyknrNoInfoOut: Omit<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberInfo, 'ykknInfo' | 'mkknInfo'>[] | null;
 };
+type IKeyOfProjection = keyof IAction<factory.actionType> | keyof IAction<factory.actionType.AuthorizeAction> | keyof IAction<factory.actionType.MoneyTransfer> | keyof IAction<factory.actionType.ReplaceAction>;
 /**
  * アクションリポジトリ
  */
@@ -83,7 +87,7 @@ export declare class ActionRepo {
     /**
      * アクション検索
      */
-    search<T extends factory.actionType>(params: factory.action.ISearchConditions, inclusion: KeyOfAction[], exclusion: KeyOfAction[]): Promise<IAction<T>[]>;
+    search<T extends factory.actionType>(params: factory.action.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<IAction<T>[]>;
     /**
      * アクション開始
      */
@@ -153,7 +157,7 @@ export declare class ActionRepo {
     findById<T extends factory.actionType>(params: {
         typeOf: T;
         id: string;
-    }, inclusion?: KeyOfAction[], exclusion?: KeyOfAction[]): Promise<IAction<T>>;
+    }, inclusion?: IKeyOfProjection[], exclusion?: IKeyOfProjection[]): Promise<IAction<T>>;
     findPayAction(params: {
         project: {
             id: string;

package/lib/chevre/repo/action.js

@@ -25,6 +25,30 @@ const factory = require("../factory");
 const settings_1 = require("../settings");
 const action_1 = require("./mongoose/schemas/action");
 const actionRecipe_1 = require("./mongoose/schemas/actionRecipe");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'actionStatus',
+    'typeOf',
+    'description',
+    'agent',
+    'recipient',
+    'result',
+    'error',
+    'object',
+    'startDate',
+    'endDate',
+    'purpose',
+    'potentialActions',
+    'amount',
+    'fromLocation',
+    'toLocation',
+    'instrument',
+    'location',
+    'replacer',
+    'targetCollection',
+    'sameAs',
+    'cancelAction'
+];
 /**
  * アクションリポジトリ
  */
@@ -432,24 +456,33 @@ class ActionRepo {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = ActionRepo.CREATE_MONGO_CONDITIONS(params);
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
+                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
                 }
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // let projection: { [key: string]: number } = {};
+            // if (Array.isArray(inclusion) && inclusion.length > 0) {
+            //     inclusion.forEach((field) => {
+            //         projection[field] = 1;
+            //     });
+            // } else {
+            //     projection = {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0
+            //     };
+            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
+            //         exclusion.forEach((field) => {
+            //             projection[field] = 0;
+            //         });
+            //     }
+            // }
             const query = this.actionModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
@@ -464,8 +497,8 @@ class ActionRepo {
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-26~
+                .exec();
         });
     }
     /**
@@ -664,33 +697,43 @@ class ActionRepo {
     }
     findById(params, inclusion, exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
+                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
                 }
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // let projection: { [key: string]: number } = {};
+            // if (Array.isArray(inclusion) && inclusion.length > 0) {
+            //     inclusion.forEach((field) => {
+            //         projection[field] = 1;
+            //     });
+            // } else {
+            //     projection = {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0
+            //     };
+            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
+            //         exclusion.forEach((field) => {
+            //             projection[field] = 0;
+            //         });
+            //     }
+            // }
             const doc = yield this.actionModel.findOne({
                 typeOf: { $eq: params.typeOf },
                 _id: { $eq: params.id }
             }, projection)
+                .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.actionModel.modelName);
             }
-            return doc.toObject();
+            return doc;
         });
     }
     findPayAction(params) {
@@ -731,33 +774,43 @@ class ActionRepo {
     searchByOrderNumber(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const conditions = {
+            const filter = {
                 $or: [
-                    { 'object.orderNumber': params.orderNumber },
-                    { 'purpose.orderNumber': params.orderNumber }
+                    { 'object.orderNumber': { $eq: params.orderNumber } },
+                    { 'purpose.orderNumber': { $eq: params.orderNumber } }
                 ]
             };
-            const query = this.actionModel.find(conditions)
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 });
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(AVAILABLE_PROJECT_FIELDS.map((key) => ([key, 1]))));
+            const query = this.actionModel.find(filter, projection);
+            // .select({ __v: 0, createdAt: 0, updatedAt: 0 });
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.startDate) !== undefined) {
                 query.sort({ startDate: params.sort.startDate });
             }
-            return query.exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+            return query
+                .lean() // 2024-08-26~
+                .exec();
         });
     }
     searchBySameAs(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            const projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                actionStatus: 1,
+                error: 1,
+                purpose: 1
+            };
             const query = this.actionModel.find(Object.assign({ typeOf: { $eq: params.typeOf.$eq }, 'sameAs.id': { $exists: true, $eq: params.sameAs.id.$eq } }, (typeof ((_a = params.purpose) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string')
                 ? { 'purpose.id': { $exists: true, $eq: params.purpose.id.$eq } }
-                : undefined))
-                .select({ _id: 1, actionStatus: 1, error: 1, purpose: 1 })
+                : undefined), projection)
+                // .select({ _id: 1, actionStatus: 1, error: 1, purpose: 1 })
                 .limit(1);
-            return query.exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+            return query
+                .lean() // 2024-08-26~
+                .exec();
         });
     }
     deleteByProject(params) {

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer/authorize.js

@@ -35,8 +35,11 @@ function createAcceptedOffersWithoutDetails(params) {
     });
 }
 exports.createAcceptedOffersWithoutDetails = createAcceptedOffersWithoutDetails;
+/**
+ * 受入オファーをCOA販売チケットへ変換する
+ */
 function offer2availableSalesTicket(params) {
-    // tslint:disable-next-line:max-func-body-length
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let availableSalesTicket;
         const offers = params.offers;
@@ -45,6 +48,7 @@ function offer2availableSalesTicket(params) {
         const availableSalesTickets = params.availableSalesTickets;
         const coaInfo = params.coaInfo;
         const isMvtkOrMG = typeof offer.ticketInfo.mvtkNum === 'string' && offer.ticketInfo.mvtkNum.length > 0;
+        const couponCode = offer.ticketInfo.couponCode; // 2024-08-27~
         // ポイント消費鑑賞券の場合
         if (typeof offer.ticketInfo.usePoint === 'number' && offer.ticketInfo.usePoint > 0) {
             // COA側のマスタ構成で、
@@ -107,7 +111,36 @@ function offer2availableSalesTicket(params) {
             }
         }
         else {
-            availableSalesTicket = availableSalesTickets.find((t) => t.ticketCode === offer.ticketInfo.ticketCode);
+            if (typeof couponCode === 'string') {
+                // クーポンコード指定の場合クーポンチケット検索結果から販売チケットをfix(2024-08-27~)
+                try {
+                    const couponTicketResult = yield repos.reserveService.couponTicket({
+                        theaterCode: coaInfo.theaterCode,
+                        couponCode,
+                        titleCode: coaInfo.titleCode,
+                        titleBranchNum: coaInfo.titleBranchNum,
+                        dateJouei: coaInfo.dateJouei,
+                        timeBegin: coaInfo.timeBegin,
+                        flgMember: (params.isMember) ? COA.factory.reserve.FlgMember.Member : COA.factory.reserve.FlgMember.NonMember
+                    });
+                    availableSalesTicket = couponTicketResult.listTicket.find((t) => t.ticketCode === offer.ticketInfo.ticketCode);
+                }
+                catch (error) {
+                    // COAサービスエラーの場合ハンドリング
+                    if (error.name === 'COAServiceError') {
+                        // COAはクライアントエラーかサーバーエラーかに関わらずステータスコード200 or 500を返却する。
+                        // 500未満であればクライアントエラーとみなす
+                        if (typeof error.code === 'number'
+                            && error.code < http_status_1.INTERNAL_SERVER_ERROR) {
+                            throw new factory.errors.NotFound(`offers.${offerIndex}`, `couponTicket ${offer.ticketInfo.ticketCode} not found. ${error.message}`);
+                        }
+                    }
+                    throw error;
+                }
+            }
+            else {
+                availableSalesTicket = availableSalesTickets.find((t) => t.ticketCode === offer.ticketInfo.ticketCode);
+            }
             // 利用可能な券種が見つからなければエラー
             if (availableSalesTicket === undefined) {
                 throw new factory.errors.NotFound(`offers.${offerIndex}`, `ticketCode ${offer.ticketInfo.ticketCode} not found.`);
@@ -243,8 +276,12 @@ flgMember) {
                 offer: offer,
                 offerIndex: offerIndex,
                 availableSalesTickets: availableSalesTickets,
-                coaInfo: coaInfo
-            })({ masterService: repos.masterService });
+                coaInfo: coaInfo,
+                isMember: (flgMember === COA.factory.reserve.FlgMember.Member)
+            })({
+                masterService: repos.masterService,
+                reserveService: repos.reserveService
+            });
             return availableSalesTicket2offerWithDetails({
                 availableSalesTicket,
                 offer,

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -127,7 +127,7 @@ function reAcceptOffer(params) {
         }, ['project', 'agent', 'typeOf']);
         const coaInfo = yield findCOAInfo({ id: params.object.event.id, project: { id: transaction.project.id } })(repos);
         // 承認アクション存在検証
-        yield repos.action.findById({ id: params.potentialActions.id, typeOf: factory.actionType.AuthorizeAction }, ['_id'], []);
+        yield repos.action.findById({ id: params.potentialActions.id, typeOf: factory.actionType.AuthorizeAction }, ['id'], []);
         const actionAttributes = {
             project: transaction.project,
             typeOf: factory.actionType.AcceptAction,

package/lib/chevre/service/order/placeOrder.js

@@ -70,7 +70,7 @@ function placeOrder(params) {
                 id: { $in: [orderActionPurpose.id] },
                 typeOf: { $in: [orderActionPurpose.typeOf] }
             }
-        }, ['_id'], []);
+        }, ['id'], []);
         if (completedActions.length === 0) {
             const action = yield repos.action.start(orderActionAttributes);
             try {

package/lib/chevre/service/payment/creditCard/voidTransaction.js

@@ -49,7 +49,7 @@ function voidTransaction(params) {
             typeOf: { $eq: factory.actionType.AuthorizeAction },
             object: { paymentMethodId: { $eq: paymentMethodId } },
             sameAs: { id: { $eq: transaction.id } }
-        }, ['_id', 'typeOf', 'project'], [])).shift();
+        }, ['id', 'typeOf', 'project'], [])).shift();
         if (authorizeInvoiceAction !== undefined) {
             const cancelAction = {
                 startTime: new Date(),

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -150,7 +150,7 @@ function checkByIdentifierIfNotYet(params) {
                             reservationFor: { id: { $eq: params.screeningEvent.id } } // 指定のイベントにおいて
                         }
                     }
-                } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['_id'], [])).shift();
+                } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['id'], [])).shift();
             debug('alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'placeOrderId:', placeOrderId);
             if (alreadyCheckedAction !== undefined) {
                 const recipe = yield repos.action.findRecipeByAction({

package/lib/chevre/service/reserve/cancelReservation.js

@@ -61,7 +61,7 @@ function cancelPengindIfNotYet(params) {
                 id: { $in: [params.purpose.id] },
                 typeOf: { $in: [params.purpose.typeOf] }
             }
-        }, ['_id'], []);
+        }, ['id'], []);
         if (completedActions.length === 0) {
             const actionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction: reserveTransaction });
             if (actionAttributes !== undefined) {

package/lib/chevre/service/reserve/confirmReservation.js

@@ -133,7 +133,7 @@ params, options) {
                 id: { $in: [actionAttributes.purpose.id] },
                 typeOf: { $in: [actionAttributes.purpose.typeOf] }
             }
-        }, ['_id'], []);
+        }, ['id'], []);
         debug(completedActions.length, 'completed reserveAction found. byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
         if (completedActions.length === 0) {
             const action = yield repos.action.start(actionAttributes);

package/package.json

@@ -9,9 +9,9 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.381.0",
-    "@cinerino/sdk": "10.7.0",
-    "@motionpicture/coa-service": "9.4.0",
+    "@chevre/factory": "4.382.0-alpha.0",
+    "@cinerino/sdk": "10.8.0-alpha.0",
+    "@motionpicture/coa-service": "9.5.0-alpha.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
     "@surfrock/sdk": "1.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.2.0-alpha.23"
+  "version": "22.2.0-alpha.24"
 }

package/example/src/chevre/searchActions.ts

@@ -1,40 +0,0 @@
-// tslint:disable:no-implicit-dependencies no-console
-import { chevre } from '../../../lib/index';
-
-import * as  mongoose from 'mongoose';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-mongoose.Model.on('index', (...args) => {
-    console.error('******** index event emitted. ********\n', args);
-});
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
-    const actions = await actionRepo.search(
-        {
-            limit: 1,
-            // typeOf: { $eq: chevre.factory.actionType.CheckAction },
-            // project: { id: { $eq: project.id } },
-            // object: {
-            //     movieTickets: {
-            //         identifier: { $eq: '0947524082' },
-            //         serviceOutput: { reservationFor: { id: { $eq: 'clhvvbpyn' } } }
-            //     }
-            // }
-            // instrument: { transactionNumber: { $eq: 'x' } },
-            sameAs: { id: { $eq: '66275034ae5d4c3e8997808c' } }
-        },
-        ['_id'],
-        []
-    );
-    console.log('actions:', actions);
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);