@chevre/domain 24.0.0-alpha.7 → 24.0.0-alpha.71

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest/verifyTicketTokenAsNeeded.js

@@ -1,30 +1,7 @@
 "use strict";
-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.verifyTicketTokenAsNeeded = verifyTicketTokenAsNeeded;
-const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../../../../factory");
 function verifyTicketTokenAsNeeded(params) {
     return async (repos) => {
         const { instrument, event } = params;
@@ -32,9 +9,9 @@ function verifyTicketTokenAsNeeded(params) {
         // 興行オファーチケットが指定された場合、オファーへ変換する
         const ticketToken = instrument.find((eachInstrument) => eachInstrument.typeOf === 'Ticket')?.ticketToken;
         if (typeof ticketToken === 'string' && ticketToken !== '') {
-            const placeOrderIdByInstrument = instrument.find((eachInstrument) => eachInstrument.typeOf === factory.transactionType.PlaceOrder)?.id;
+            const placeOrderIdByInstrument = instrument.find((eachInstrument) => eachInstrument.typeOf === factory_1.factory.transactionType.PlaceOrder)?.id;
             if (typeof placeOrderIdByInstrument !== 'string' || placeOrderIdByInstrument === '') {
-                throw new factory.errors.NotFound('instrument as placeOrder');
+                throw new factory_1.factory.errors.NotFound('instrument as placeOrder');
             }
             const ticket = (await repos.ticket.findTickets({
                 limit: 1,
@@ -43,7 +20,7 @@ function verifyTicketTokenAsNeeded(params) {
                 ticketToken: { $eq: ticketToken }
             }, ['ticketToken'])).shift();
             if (ticket === undefined) {
-                throw new factory.errors.NotFound('Ticket');
+                throw new factory_1.factory.errors.NotFound('Ticket');
             }
             // 承認を参照
             const validAuthorization = await repos.authorization.findValidOneByCode({
@@ -52,20 +29,20 @@ function verifyTicketTokenAsNeeded(params) {
             });
             const authorizedObject = validAuthorization.object;
             // audience検証
-            if (validAuthorization.audience?.typeOf !== factory.transactionType.PlaceOrder
+            if (validAuthorization.audience?.typeOf !== factory_1.factory.transactionType.PlaceOrder
                 || validAuthorization.audience.id !== placeOrderIdByInstrument) {
-                throw new factory.errors.Argument('ticketToken', 'audience not matched with placeOrder');
+                throw new factory_1.factory.errors.Argument('ticketToken', 'audience not matched with placeOrder');
             }
-            if (authorizedObject.typeOf === factory.offerType.Offer) {
+            if (authorizedObject.typeOf === factory_1.factory.offerType.Offer) {
                 // イベントIDを検証
                 const eventIdMustBe = authorizedObject.itemOffered.serviceOutput.reservationFor.id;
                 if (eventIdMustBe !== event.id) {
-                    throw new factory.errors.Argument('ticketToken', 'event.id not matched');
+                    throw new factory_1.factory.errors.Argument('ticketToken', 'event.id not matched');
                 }
                 acceptedEventOffer = authorizedObject;
             }
             else {
-                throw new factory.errors.Argument('ticketToken', 'must be Offer');
+                throw new factory_1.factory.errors.Argument('ticketToken', 'must be Offer');
             }
         }
         return { acceptedEventOffer };

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.d.ts

@@ -1,4 +1,4 @@
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { EventOfferRepo } from '../../../repo/eventOffer';

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -1,27 +1,4 @@
 "use strict";
-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 };
 };
@@ -29,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateStartRequest = validateStartRequest;
 exports.validEventOfferByApplicationExists = validEventOfferByApplicationExists;
 const moment_1 = __importDefault(require("moment"));
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 const fixExtendedEventOffer_1 = require("./validateStartRequest/fixExtendedEventOffer");
 const validateIssuedOfferIfExists_1 = require("./validateStartRequest/validateIssuedOfferIfExists");
 const validateMemberTierIfExists_1 = require("./validateStartRequest/validateMemberTierIfExists");
@@ -40,7 +17,7 @@ function validateStartRequest(params) {
         const event = params.event;
         if (params.validateEventOfferPeriod === true) {
             if (typeof params.store?.id !== 'string') {
-                throw new factory.errors.NotFound('store.id');
+                throw new factory_1.factory.errors.NotFound('store.id');
             }
             // ticketTokenから、acceptedEventOfferを生成(2025-11-18~)
             const { acceptedEventOffer } = await (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
@@ -78,7 +55,7 @@ function validEventOfferByApplicationExists(params) {
                 || (!Array.isArray(offer.availableAtOrFrom) && offer.availableAtOrFrom?.id === availableAt.id);
         });
         if (makesOfferOnApplication === undefined) {
-            throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${availableAt.id}`);
+            throw new factory_1.factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${availableAt.id}`);
         }
         const validFrom = makesOfferOnApplication.validFrom;
         const validThrough = makesOfferOnApplication.validThrough;
@@ -86,16 +63,16 @@ function validEventOfferByApplicationExists(params) {
         // const validThrough = eventOffers?.validThrough;
         if (validFrom !== undefined && validFrom !== null) {
             if (acceptedDate.isBefore((0, moment_1.default)(validFrom))) {
-                throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid from ${validFrom}`);
+                throw new factory_1.factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid from ${validFrom}`);
             }
         }
         if (validThrough !== undefined && validThrough !== null) {
             if (acceptedDate.isAfter((0, moment_1.default)(validThrough))) {
-                throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
+                throw new factory_1.factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
             }
         }
         // support extensibleEventOffer(2025-11-11~)
-        if (eventOffers.typeOf === factory.offerType.AggregateOffer) {
+        if (eventOffers.typeOf === factory_1.factory.offerType.AggregateOffer) {
             const existingEventOffer = await (0, fixExtendedEventOffer_1.fixExtendedEventOffer)(params)(repos);
             // 拡張可能なオファー設定の場合のみ、オファートークンを検証する(2025-11-11~)
             await (0, validateIssuedOfferIfExists_1.validateIssuedOfferIfExists)({
@@ -148,7 +125,7 @@ function validateEvent(params) {
         const numAcceptedOffers = params.object.acceptedOffer?.length;
         if (typeof numAcceptedOffers === 'number' && numAcceptedOffers > 0) {
             if (numAcceptedOffers > maxValue) {
-                throw new factory.errors.Argument('reservationFor.id', `Maximum number of offers exceeded`);
+                throw new factory_1.factory.errors.Argument('reservationFor.id', `Maximum number of offers exceeded`);
             }
         }
     }

package/lib/chevre/service/assetTransaction/reserveCOA/cancel.d.ts

@@ -1,12 +1,24 @@
-import type * as COA from '@motionpicture/coa-service';
-import * as factory from '../../../factory';
+import type { COA } from '@motionpicture/coa-service';
+import { factory } from '../../../factory';
 import { ActionRepo } from '../../../repo/action';
+import { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import { TaskRepo } from '../../../repo/task';
-type ICancelOperation<T> = (repos: {
+interface ICancelRepos {
     action: ActionRepo;
     reserveService: COA.service.Reserve;
     task: TaskRepo;
-}) => Promise<T>;
+}
+type ICancelOperation<T> = (repos: ICancelRepos) => Promise<T>;
+interface ICancelByAcceptActionRepos {
+    action: ActionRepo;
+    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
+    reserveService: COA.service.Reserve;
+    task: TaskRepo;
+}
+type ICancelByAcceptActionOperation<T> = (repos: ICancelByAcceptActionRepos) => Promise<T>;
+/**
+ * 興行オファー承認アクションからCOA予約を取り消す
+ */
 declare function cancel(params: {
     action: factory.action.authorize.offer.eventService.IAction;
 }, options: {
@@ -15,6 +27,9 @@ declare function cancel(params: {
      */
     asyncCancelPendingReservation: boolean;
 }): ICancelOperation<void>;
+/**
+ * 興行オファー採用アクションからCOA予約を取り消す
+ */
 declare function cancelByAcceptAction(params: {
     action: factory.action.accept.coaOffer.IAction;
 }, options: {
@@ -22,5 +37,5 @@ declare function cancelByAcceptAction(params: {
      * cancelPendingReservation async?(2025-03-03~)
      */
     asyncCancelPendingReservation: boolean;
-}): ICancelOperation<void>;
-export { cancel, cancelByAcceptAction };
+}): ICancelByAcceptActionOperation<void>;
+export { ICancelRepos, ICancelByAcceptActionRepos, cancel, cancelByAcceptAction };

package/lib/chevre/service/assetTransaction/reserveCOA/cancel.js

@@ -1,32 +1,12 @@
 "use strict";
-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.cancel = cancel;
 exports.cancelByAcceptAction = cancelByAcceptAction;
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 const cancelReservation_1 = require("../../reserveCOA/cancelReservation");
+/**
+ * 興行オファー承認アクションからCOA予約を取り消す
+ */
 function cancel(params, options) {
     return async (repos) => {
         // object.pendingTransactionに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
@@ -47,18 +27,18 @@ function cancel(params, options) {
             const { asyncCancelPendingReservation } = options;
             const object = {
                 ...delTmpReserveParams,
-                reservationStatus: factory.reservationStatusType.ReservationPending,
+                reservationStatus: factory_1.factory.reservationStatusType.ReservationPending,
                 transactionNumber: delTmpReserveParams.tmpReserveNum,
-                typeOf: factory.assetTransactionType.COAReserveTransaction
+                typeOf: factory_1.factory.assetTransactionType.COAReserveTransaction
             };
             const instrument = [params.action.purpose];
             if (asyncCancelPendingReservation) {
                 // support async(2025-03-03~)
                 const data = { object, instrument };
                 const cancelPendingReservationTask = {
-                    project: { id: params.action.project.id, typeOf: factory.organizationType.Project },
-                    name: factory.taskName.CancelPendingReservation,
-                    status: factory.taskStatus.Ready,
+                    project: { id: params.action.project.id, typeOf: factory_1.factory.organizationType.Project },
+                    name: factory_1.factory.taskName.CancelPendingReservation,
+                    status: factory_1.factory.taskStatus.Ready,
                     runsAt: new Date(),
                     remainingNumberOfTries: 10,
                     numberOfTried: 0,
@@ -77,9 +57,12 @@ function cancel(params, options) {
         }
     };
 }
+/**
+ * 興行オファー採用アクションからCOA予約を取り消す
+ */
 function cancelByAcceptAction(params, options) {
     return async (repos) => {
-        const recipe = await repos.action.findRecipeByAction({
+        const recipe = await repos.acceptCOAOfferAction.findRecipeByAction({
             project: { id: params.action.project.id },
             recipeFor: { id: params.action.id }
         });
@@ -102,18 +85,18 @@ function cancelByAcceptAction(params, options) {
                 const { asyncCancelPendingReservation } = options;
                 const object = {
                     ...delTmpReserveParams,
-                    reservationStatus: factory.reservationStatusType.ReservationPending,
+                    reservationStatus: factory_1.factory.reservationStatusType.ReservationPending,
                     transactionNumber: delTmpReserveParams.tmpReserveNum,
-                    typeOf: factory.assetTransactionType.COAReserveTransaction
+                    typeOf: factory_1.factory.assetTransactionType.COAReserveTransaction
                 };
                 const instrument = [params.action.purpose];
                 if (asyncCancelPendingReservation) {
                     // support async(2025-03-03~)
                     const data = { object, instrument };
                     const cancelPendingReservationTask = {
-                        project: { id: params.action.project.id, typeOf: factory.organizationType.Project },
-                        name: factory.taskName.CancelPendingReservation,
-                        status: factory.taskStatus.Ready,
+                        project: { id: params.action.project.id, typeOf: factory_1.factory.organizationType.Project },
+                        name: factory_1.factory.taskName.CancelPendingReservation,
+                        status: factory_1.factory.taskStatus.Ready,
                         runsAt: new Date(),
                         remainingNumberOfTries: 10,
                         numberOfTried: 0,

package/lib/chevre/service/assetTransaction/reserveCOA/factory.d.ts

@@ -1,5 +1,5 @@
-import type * as COA from '@motionpicture/coa-service';
-import * as factory from '../../../factory';
+import type { COA } from '@motionpicture/coa-service';
+import { factory } from '../../../factory';
 interface IProcessConfirmCOAReserveResult {
     stateReserveArgs?: COA.factory.reserve.IStateReserveArgs;
     stateReserveResult?: COA.factory.reserve.IStateReserveResult | null;

package/lib/chevre/service/assetTransaction/reserveCOA/factory.js

@@ -1,43 +1,20 @@
 "use strict";
-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.processConfirmCOAReserveResult2recipe = processConfirmCOAReserveResult2recipe;
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 function processConfirmCOAReserveResult2recipe(params) {
     const { processConfirmCOAReserveResult, project } = params;
     const { stateReserveArgs, stateReserveResult, updReserveArgs, updReserveResult } = processConfirmCOAReserveResult;
     return {
-        project: { id: project.id, typeOf: factory.organizationType.Project },
+        project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
         typeOf: 'Recipe',
-        recipeCategory: factory.recipe.RecipeCategory.confirmCOAReserve,
+        recipeCategory: factory_1.factory.recipe.RecipeCategory.confirmCOAReserve,
         step: [{
                 typeOf: 'HowToSection',
                 itemListElement: [
                     {
                         typeOf: 'HowToStep',
-                        identifier: factory.recipe.StepIdentifier.stateReserve,
+                        identifier: factory_1.factory.recipe.StepIdentifier.stateReserve,
                         itemListElement: [{
                                 typeOf: 'HowToDirection',
                                 ...(stateReserveArgs !== undefined) ? { beforeMedia: stateReserveArgs } : undefined,
@@ -48,7 +25,7 @@ function processConfirmCOAReserveResult2recipe(params) {
                     },
                     {
                         typeOf: 'HowToStep',
-                        identifier: factory.recipe.StepIdentifier.updReserve,
+                        identifier: factory_1.factory.recipe.StepIdentifier.updReserve,
                         itemListElement: [{
                                 typeOf: 'HowToDirection',
                                 ...(updReserveArgs !== undefined) ? { beforeMedia: updReserveArgs } : undefined,

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

@@ -1,8 +1,8 @@
 /**
  * COA予約取引サービス
  */
-import type * as COA from '@motionpicture/coa-service';
-import * as factory from '../../factory';
+import type { COA } from '@motionpicture/coa-service';
+import { factory } from '../../factory';
 import { IProcessConfirmCOAReserveResult } from './reserveCOA/factory';
 interface IConfirmRepo {
     reserveService: COA.service.Reserve;

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

@@ -1,4 +1,4 @@
-import * as factory from '../factory';
+import { factory } from '../factory';
 import type { AssetTransactionRepo } from '../repo/assetTransaction';
 import type { TaskRepo } from '../repo/task';
 import * as CancelReservationTransactionService from './assetTransaction/cancelReservation';
@@ -39,4 +39,4 @@ export declare function exportOneTransactionTasksIfExists(params: {
 }): (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType>, "id" | "typeOf"> | void>;
+}) => Promise<Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType>, "id" | "typeOf"> | undefined>;

package/lib/chevre/service/assetTransaction.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reserve = exports.registerService = exports.refund = exports.pay = exports.moneyTransfer = exports.cancelReservation = void 0;
 exports.exportOneTransactionTasksIfExists = exportOneTransactionTasksIfExists;
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const CancelReservationTransactionService = __importStar(require("./assetTransaction/cancelReservation"));
 const MoneyTransferTransactionService = __importStar(require("./assetTransaction/moneyTransfer"));
 const PayTransactionService = __importStar(require("./assetTransaction/pay"));
@@ -58,42 +58,42 @@ function exportOneTransactionTasksIfExists(params) {
         // let createdTasks: { id: string }[] = [];
         // 失敗してもここでは戻さない(RUNNINGのまま待機)
         switch (transaction.typeOf) {
-            case factory.assetTransactionType.CancelReservation:
+            case factory_1.factory.assetTransactionType.CancelReservation:
                 // createdTasks =
                 await CancelReservationTransactionService.exportTasksById({
                     id: transaction.id
                     // runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
-            case factory.assetTransactionType.MoneyTransfer:
+            case factory_1.factory.assetTransactionType.MoneyTransfer:
                 // createdTasks =
                 await MoneyTransferTransactionService.exportTasksById({
                     id: transaction.id,
                     runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
-            case factory.assetTransactionType.Pay:
+            case factory_1.factory.assetTransactionType.Pay:
                 // createdTasks =
                 await PayTransactionService.exportTasksById({
                     id: transaction.id,
                     runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
-            case factory.assetTransactionType.Refund:
+            case factory_1.factory.assetTransactionType.Refund:
                 // createdTasks =
                 await RefundTransactionService.exportTasksById({
                     id: transaction.id,
                     runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
-            case factory.assetTransactionType.RegisterService:
+            case factory_1.factory.assetTransactionType.RegisterService:
                 // createdTasks =
                 await RegisterServiceTransactionService.exportTasksById({
                     id: transaction.id
                     // runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
-            case factory.assetTransactionType.Reserve:
+            case factory_1.factory.assetTransactionType.Reserve:
                 // createdTasks =
                 await ReserveTransactionService.exportTasksById({
                     id: transaction.id

package/lib/chevre/service/delivery/factory.d.ts

@@ -1,4 +1,4 @@
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 export type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>;
 /**
  * 注文から所有権を作成する

package/lib/chevre/service/delivery/factory.js

@@ -1,44 +1,21 @@
 "use strict";
-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.createOwnershipInfosFromOrder = createOwnershipInfosFromOrder;
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
-const util = __importStar(require("util"));
-const factory = __importStar(require("../../factory"));
-const factory_1 = require("./product/factory");
-const factory_2 = require("./reservation/factory");
+const util_1 = require("util");
+const factory_1 = require("../../factory");
+const factory_2 = require("./product/factory");
+const factory_3 = require("./reservation/factory");
 /**
  * 注文から所有権を作成する
  */
 function createOwnershipInfosFromOrder(params) {
     const ownershipInfos = [];
     if (!Array.isArray(params.order.acceptedOffers)) {
-        throw new factory.errors.ArgumentNull('order.acceptedOffers');
+        throw new factory_1.factory.errors.ArgumentNull('order.acceptedOffers');
     }
     params.order.acceptedOffers.forEach((acceptedOffer, offerIndex) => {
         const itemOffered = acceptedOffer.itemOffered;
@@ -53,16 +30,29 @@ function createOwnershipInfosFromOrder(params) {
         });
         const acquiredFrom = createAcquiredFrom(params);
         const ownedBy = createOwnedby(params);
-        const itemOfferedType = itemOffered.typeOf;
-        switch (itemOfferedType) {
-            case factory.reservationType.BusReservation:
-            case factory.reservationType.EventReservation:
-                const excludeCOAReservation = acceptedOffer.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA;
-                if (excludeCOAReservation) {
-                    // bookingService:COAでは作成しない(2024-12-31~)
+        // 所有者があれば所有権を作成する
+        if (ownedBy.length > 0) {
+            const itemOfferedType = itemOffered.typeOf;
+            switch (itemOfferedType) {
+                case factory_1.factory.reservationType.EventReservation: {
+                    const excludeCOAReservation = acceptedOffer.offeredThrough?.identifier === factory_1.factory.service.webAPI.Identifier.COA;
+                    if (excludeCOAReservation) {
+                        // bookingService:COAでは作成しない(2024-12-31~)
+                    }
+                    else {
+                        ownershipInfo = (0, factory_3.createReservationOwnershipInfo)({
+                            project: params.order.project,
+                            ownedBy: ownedBy,
+                            acceptedOffer: { ...acceptedOffer, itemOffered },
+                            ownedFrom: ownedFrom,
+                            identifier: identifier,
+                            acquiredFrom: acquiredFrom
+                        });
+                    }
+                    break;
                 }
-                else {
-                    ownershipInfo = (0, factory_2.createReservationOwnershipInfo)({
+                case factory_1.factory.permit.PermitType.Permit:
+                    ownershipInfo = (0, factory_2.createProductOwnershipInfo)({
                         project: params.order.project,
                         ownedBy: ownedBy,
                         acceptedOffer: { ...acceptedOffer, itemOffered },
@@ -70,24 +60,14 @@ function createOwnershipInfosFromOrder(params) {
                         identifier: identifier,
                         acquiredFrom: acquiredFrom
                     });
-                }
-                break;
-            case factory.permit.PermitType.Permit:
-                ownershipInfo = (0, factory_1.createProductOwnershipInfo)({
-                    project: params.order.project,
-                    ownedBy: ownedBy,
-                    acceptedOffer: { ...acceptedOffer, itemOffered },
-                    ownedFrom: ownedFrom,
-                    identifier: identifier,
-                    acquiredFrom: acquiredFrom
-                });
-                break;
-            case factory.actionType.MoneyTransfer:
-                // no op
-                // 所有権は発生しない
-                break;
-            default:
-                throw new factory.errors.NotImplemented(`Offered item type ${itemOfferedType} not implemented`);
+                    break;
+                // case factory.actionType.MoneyTransfer:
+                //     // no op
+                //     // 所有権は発生しない
+                //     break;
+                default:
+                    throw new factory_1.factory.errors.NotImplemented(`Offered item type ${itemOfferedType} not implemented`);
+            }
         }
         if (ownershipInfo !== undefined) {
             ownershipInfos.push(ownershipInfo);
@@ -96,7 +76,7 @@ function createOwnershipInfosFromOrder(params) {
     return ownershipInfos;
 }
 function createOwnershipInfoIdentifier(params) {
-    return util.format('%s-%s-%s-%s', params.order.customer.id, params.itemOffered.typeOf, params.order.orderNumber, (params.offerIndexBase + params.offerIndex));
+    return (0, util_1.format)('%s-%s-%s-%s', params.order.customer.id, params.itemOffered.typeOf, params.order.orderNumber, (params.offerIndexBase + params.offerIndex));
 }
 function createAcquiredFrom(params) {
     // 最低限の情報に絞る
@@ -112,19 +92,19 @@ function createAcquiredFrom(params) {
     };
 }
 function createOwnedby(params) {
-    // 最低限の情報に絞る
     const customer = params.order.customer;
     let owner;
     // 顧客組織の場合
-    if (customer.typeOf === factory.organizationType.Organization) {
-        const ownerAsOrganization = {
-            // 個人情報排除するように
-            typeOf: customer.typeOf,
-            id: customer.id
-        };
-        owner = ownerAsOrganization;
+    if (customer.typeOf === factory_1.factory.organizationType.Organization) {
+        // discontinue(2026-03-15~)
+        // const ownerAsOrganization: factory.ownershipInfo.IOwnerAsOrganization = {
+        //     // 個人情報排除するように
+        //     typeOf: customer.typeOf,
+        //     id: customer.id
+        // };
+        // owner = ownerAsOrganization;
     }
-    else if (customer.typeOf === factory.personType.Person) {
+    else if (customer.typeOf === factory_1.factory.personType.Person) {
         const ownerAsPerson = {
             // 個人情報排除するように
             typeOf: customer.typeOf,
@@ -133,11 +113,12 @@ function createOwnedby(params) {
         owner = ownerAsPerson;
     }
     else {
-        owner = {
-            // 個人情報排除するように
-            typeOf: customer.typeOf,
-            id: customer.id
-        };
+        // discontinue(2026-03-15~)
+        // owner = {
+        //     // 個人情報排除するように
+        //     typeOf: customer.typeOf,
+        //     id: customer.id
+        // };
     }
-    return [owner];
+    return (owner !== undefined) ? [owner] : [];
 }