@chevre/domain 26.0.0-alpha.2 → 26.0.0-alpha.3

package/lib/chevre/service/assetTransaction/reserve/start/factory/createStartParams.js

@@ -9,7 +9,7 @@ function createStartParams(params) {
         typeOf: factory_1.factory.organizationType.Corporation
     };
     // reservationFor,issuedThrough保管をaddReservationsから移行(2024-07-01~)
-    const reservationFor = createReservationFor(params.event, true);
+    const reservationFor = createReservationFor(params.event);
     const { issuedThrough } = createIssuedThrough({ reservationFor: params.event });
     const reservationPackage = {
         issuedThrough, // addReservationsから移行(2024-07-01~)
@@ -33,7 +33,7 @@ function createStartParams(params) {
         instrument
     };
 }
-function createReservationFor(params, useOptimizeReservation) {
+function createReservationFor(params) {
     if (params.typeOf === factory_1.factory.eventType.ScreeningEvent) {
         return {
             endDate: params.endDate,
@@ -41,7 +41,7 @@ function createReservationFor(params, useOptimizeReservation) {
             location: params.location,
             name: params.name,
             startDate: params.startDate,
-            superEvent: optimizeReservationSuperEvent(params, useOptimizeReservation),
+            superEvent: optimizeReservationSuperEvent(params),
             typeOf: params.typeOf,
             ...(params.doorTime instanceof Date)
                 ? { doorTime: params.doorTime }
@@ -52,38 +52,18 @@ function createReservationFor(params, useOptimizeReservation) {
         throw new factory_1.factory.errors.NotImplemented(`typeOf: ${params.typeOf}`);
     }
 }
-function optimizeReservationSuperEvent(params, useOptimizeReservation) {
+function optimizeReservationSuperEvent(params) {
     const superEvent = params.superEvent;
     return {
         id: superEvent.id,
-        // kanaName: superEvent.kanaName, // 廃止(2024-01-26~)
         location: superEvent.location,
         name: superEvent.name,
-        soundFormat: superEvent.soundFormat,
+        // soundFormat: superEvent.soundFormat, // discontinue(2026-08-01~)
         typeOf: superEvent.typeOf,
         workPerformed: superEvent.workPerformed,
-        // 廃止(2024-01-26~)
-        // ...(superEvent.description !== undefined)
-        //     ? { description: superEvent.description }
-        //     : undefined,
         ...(superEvent.headline !== undefined)
             ? { headline: superEvent.headline }
             : undefined,
-        // 最適化対応(2024-03-16~)
-        ...(useOptimizeReservation)
-            ? {}
-            : {
-                additionalProperty: (Array.isArray(superEvent.additionalProperty))
-                    ? superEvent.additionalProperty
-                    : []
-            }
-        // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMATで再設定可能)(2026-02-03~)
-        // ...(USE_DEPRECATED_VIDEO_FORMAT)
-        //     ? {
-        //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
-        //         videoFormat: (<any>superEvent).videoFormat
-        //     }
-        //     : undefined
     };
 }
 function createIssuedThrough(params) {

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

@@ -100,7 +100,7 @@ function responseBody2acceptedOffers4result(params) {
             name: event.superEvent.name,
             alternativeHeadline: event.superEvent.alternativeHeadline,
             location: event.superEvent.location,
-            soundFormat: event.superEvent.soundFormat,
+            // soundFormat: event.superEvent.soundFormat, // discontinue(2026-08-01~)
             workPerformed: workPerformed,
             duration: event.superEvent.duration,
             coaInfo: event.superEvent.coaInfo

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

@@ -60,7 +60,10 @@ function call(params) {
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
         }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
-        await EventAggregationService.importFromCOA(params.data)({
+        await EventAggregationService.importFromCOA({
+            ...params.data,
+            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project }
+        })({
             event: new event_1.EventRepo(connection),
             reserveService
         });

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

@@ -67,7 +67,10 @@ function call(params) {
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
         }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
-        await EventService.importFromCOA(params.data)({
+        await EventService.importFromCOA({
+            ...params.data,
+            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project }
+        })({
             action: new action_1.ActionRepo(connection),
             categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
             creativeWork: new creativeWork_1.CreativeWorkRepo(connection),

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

@@ -65,22 +65,22 @@ function call(params) {
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const aggregateOfferRepo = new aggregateOffer_1.AggregateOfferRepo(connection);
         const categoryCodeRepo = new categoryCode_1.CategoryCodeRepo(connection);
-        // const taskRepo = new TaskRepo(connection);
         const masterService = new coa_service_1.COA.service.Master({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
         }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
         await OfferService.event.importFromCOA({
-            project: { id: params.data.project.id },
+            project: { id: params.project.id },
             theaterCode: params.data.theaterCode,
             paymentMethodType4membershipCoupon
         })({
-            // categoryCode: categoryCodeRepo,
             aggregateOffer: aggregateOfferRepo,
-            // task: taskRepo,
             masterService
         });
-        await OfferService.event.importCategoryCodesFromCOA(params.data)({
+        await OfferService.event.importCategoryCodesFromCOA({
+            ...params.data,
+            project: { id: params.project.id }
+        })({
             categoryCode: categoryCodeRepo,
             masterService
         });

package/lib/chevre/service/taskHandler.js

@@ -44,40 +44,6 @@ function executeTask(task, next) {
             const { call } = await exports.taskLoader.load(task.name); // testが書きづらいのでtaskLoader経由で呼ぶ
             const callResult = await call(task)(settings, options);
             // ICallableTaskOperationSimpleを廃止(2026-07-22~)
-            // let callResult: ICallResult | undefined;
-            // switch (task.name) {
-            //     case factory.taskName.AcceptCOAOffer:
-            //     case factory.taskName.AggregateOnSystem:
-            //     case factory.taskName.AuthorizePayment:
-            //     case factory.taskName.CancelPendingReservation:
-            //     case factory.taskName.CheckMovieTicket:
-            //     case factory.taskName.CheckResource:
-            //     case factory.taskName.CreateAccountingReport:
-            //     case factory.taskName.HandleNotification:
-            //     case factory.taskName.ImportEventCapacitiesFromCOA:
-            //     case factory.taskName.ImportEventsFromCOA:
-            //     case factory.taskName.ImportOffersFromCOA:
-            //     case factory.taskName.InvalidatePaymentUrl:
-            //     case factory.taskName.OnAuthorizationCreated:
-            //     case factory.taskName.OnResourceDeleted:
-            //     case factory.taskName.Pay:
-            //     case factory.taskName.PublishPaymentUrl:
-            //     case factory.taskName.Refund:
-            //     case factory.taskName.VoidPayTransaction:
-            //     case factory.taskName.VoidReserveTransaction:
-            //     case factory.taskName.ConfirmPayTransaction:
-            //     case factory.taskName.ConfirmReserveTransaction:
-            //     case factory.taskName.ReturnPayTransaction:
-            //     case factory.taskName.ReturnReserveTransaction:
-            //     case factory.taskName.SendEmailMessage:
-            //     case factory.taskName.SyncResourcesFromCOA:
-            //     case factory.taskName.TriggerWebhook:
-            //     case factory.taskName.UseReservation:
-            //         callResult = await (call as ICallableTaskOperation)(task)(settings, options);
-            //         break;
-            //     default:
-            //         await (call as ICallableTaskOperationSimple)(task.data)(settings); // TODO discontinue
-            // }
             const result = {
                 executedAt: now,
                 endDate: new Date(),

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.1.0-alpha.2",
+    "@chevre/factory": "10.1.0-alpha.4",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.2"
+  "version": "26.0.0-alpha.3"
 }