@chevre/domain 26.1.0-alpha.0 → 26.1.0-alpha.2

package/lib/chevre/service/order/deleteOrder.d.ts

@@ -1,5 +1,5 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
-import type { AccountingReportRepo } from '../../repo/accountingReport';
+import type { AdminAccountingReportRepo } from '../../repo/adminAccountingReport';
 import type { IDeleteActionResult, AdminActionRepo } from '../../repo/adminAction';
 import type { NoteRepo } from '../../repo/note';
 import type { OrderRepo } from '../../repo/order';
@@ -17,7 +17,7 @@ declare function deleteOrder(params: {
     };
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
-    accountingReport: AccountingReportRepo;
+    adminAccountingReport: AdminAccountingReportRepo;
     adminAction: AdminActionRepo;
     note: NoteRepo;
     order: OrderRepo;

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

@@ -35,7 +35,7 @@ function deleteOrder(params) {
         //     console.error('deleteOwnershipInfosByOrder throws', error);
         // }
         // 経理レポート削除
-        await repos.accountingReport.deleteByOrderNumber({ mainEntity: { orderNumber: order.orderNumber } });
+        await repos.adminAccountingReport.deleteByOrderNumber({ mainEntity: { orderNumber: order.orderNumber } });
         // メモ削除(2024-02-15~)
         await repos.note.deleteNotesByAbout({
             about: {

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

@@ -42,7 +42,7 @@ function checkMovieTicket(params) {
                 ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } // タスク関連付け(2024-05-21~)
                 : undefined
         };
-        const action = await repos.actions.checkMovieTicket.start(actionAttributes);
+        const action = await repos.actions.checkMovieTicket.startCheckMovieTicketAction(actionAttributes);
         let processPurchaseNumberAuthResult;
         let recipe;
         try {
@@ -76,15 +76,15 @@ function checkMovieTicket(params) {
             // アクション保管用のエラーと両方保管(2024-05-22~)
             const errors = [(0, errorHandler_1.handleMvtkReserveError)(error), error];
             try {
-                await repos.actions.checkMovieTicket.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error: errors });
+                await repos.actions.checkMovieTicket.giveUpCheckMovieTicketAction({ typeOf: actionAttributes.typeOf, id: action.id, error: errors });
             }
             catch (__) {
                 // 失敗したら仕方ない
             }
             throw errors[0];
         }
-        const result = {};
-        await repos.actions.checkMovieTicket.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result, recipe });
+        // const result: factory.action.check.paymentMethod.movieTicket.IResult = {};
+        await repos.actions.checkMovieTicket.completeCheckMovieTicketAction({ typeOf: actionAttributes.typeOf, id: action.id, recipe });
         return { result: processPurchaseNumberAuthResult };
     };
 }

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

@@ -121,58 +121,28 @@ function checkByIdentifierIfNotYet(params) {
         }
         const specifiedCheckedActionId = params.checkedAction?.id;
         if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
-            alreadyCheckedAction = (await repos.actions.checkMovieTicket.findCompletedCheckActions({
-                // limit: 1,
-                // page: 1,
-                // id: { $in: [specifiedCheckedActionId] },
+            alreadyCheckedAction = await repos.actions.checkMovieTicket.findCompletedCheckMovieTicketAction({
                 id: specifiedCheckedActionId,
-                // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-                // ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
-                ...(typeof placeOrderId === 'string') ? { purpose: { id: placeOrderId } } : undefined
-            })).shift();
-            if (alreadyCheckedAction === undefined) {
+                purpose: { id: placeOrderId }
+            });
+            if (typeof alreadyCheckedAction?.id !== 'string') {
                 throw new factory_1.factory.errors.NotFound(factory_1.factory.actionType.CheckAction);
             }
         }
         else {
             // 認証IDの未指定ケースは廃止(2026-03-21~)
             throw new factory_1.factory.errors.ArgumentNull('checkedAction.id');
-            // // 認証IDの未指定ケースがあるかどうか確認するためにlog
-            // console.log('checkByIdentifierIfNotYet: specifiedCheckedActionId undefined. params:', JSON.stringify(params));
-            // alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions(
-            //     {
-            //         // limit: 1,
-            //         // page: 1,
-            //         sort: { startDate: factory.sortType.Descending },
-            //         // typeOf: { $eq: factory.actionType.CheckAction },
-            //         // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-            //         object: {
-            //             typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
-            //             id: { $eq: params.paymentServiceId }, // 指定の決済サービスにおいて
-            //             movieTickets: {
-            //                 identifier: { $eq: params.movieTicketIdentifier }, // 指定の決済カードコードを
-            //                 serviceOutput: {
-            //                     reservationFor: { id: { $eq: params.screeningEvent.id } } // 指定のイベントにおいて
-            //                 }
-            //             }
-            //         },
-            //         // ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
-            //         ...(typeof placeOrderId === 'string') ? { purpose: { id: placeOrderId } } : undefined
-            //     }
-            // )).shift();
         }
         debug('checkByIdentifierIfNotYet: alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'params:', JSON.stringify(params));
-        if (alreadyCheckedAction !== undefined) {
-            const recipe = await repos.actions.checkMovieTicket.findRecipeByAction({
-                project: { id: params.screeningEvent.project.id },
-                recipeFor: { id: alreadyCheckedAction.id }
-            });
-            const directionPurchaseNumberAuth = recipe?.step[0]?.itemListElement[0]?.itemListElement[0];
-            if (directionPurchaseNumberAuth !== undefined) {
-                const { beforeMedia, afterMedia } = directionPurchaseNumberAuth;
-                if (beforeMedia !== undefined && afterMedia !== undefined) {
-                    checkResult = { purchaseNumberAuthIn: beforeMedia, purchaseNumberAuthResult: afterMedia };
-                }
+        const recipe = await repos.actions.checkMovieTicket.findRecipeByAction({
+            project: { id: params.screeningEvent.project.id },
+            recipeFor: { id: alreadyCheckedAction.id }
+        });
+        const directionPurchaseNumberAuth = recipe?.step[0]?.itemListElement[0]?.itemListElement[0];
+        if (directionPurchaseNumberAuth !== undefined) {
+            const { beforeMedia, afterMedia } = directionPurchaseNumberAuth;
+            if (beforeMedia !== undefined && afterMedia !== undefined) {
+                checkResult = { purchaseNumberAuthIn: beforeMedia, purchaseNumberAuthResult: afterMedia };
             }
         }
         if (checkResult === undefined) {

package/lib/chevre/service/task/deleteTransaction.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
-const accountingReport_1 = require("../../repo/accountingReport");
+const adminAccountingReport_1 = require("../../repo/adminAccountingReport");
 const update_1 = require("../../repo/action/update");
 const adminAction_1 = require("../../repo/adminAction");
 const adminTransaction_1 = require("../../repo/adminTransaction");
@@ -21,7 +21,7 @@ function call(params) {
         const { data } = params;
         await (0, transaction_1.deleteTransaction)(data)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
-            accountingReport: new accountingReport_1.AccountingReportRepo(connection),
+            adminAccountingReport: new adminAccountingReport_1.AdminAccountingReportRepo(connection),
             actions: {
                 update: new update_1.UpdateActionRepo(connection),
             },

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../../factory';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
-import type { AccountingReportRepo } from '../../repo/accountingReport';
+import type { AdminAccountingReportRepo } from '../../repo/adminAccountingReport';
 import type { UpdateActionRepo } from '../../repo/action/update';
 import type { AdminActionRepo } from '../../repo/adminAction';
 import type { AdminTransactionRepo } from '../../repo/adminTransaction';
@@ -12,7 +12,7 @@ import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 interface IDeleteTransactionRepos {
     acceptedOffer: AcceptedOfferRepo;
-    accountingReport: AccountingReportRepo;
+    adminAccountingReport: AdminAccountingReportRepo;
     actions: {
         update: UpdateActionRepo;
     };

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.1.0-alpha.0"
+  "version": "26.1.0-alpha.2"
 }