@chevre/domain 24.1.0-alpha.1 → 24.1.0-alpha.10

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

@@ -19,84 +19,79 @@ function createAccountingReportIfNotExist(params) {
 }
 // 最適化(2023-06-30~)
 function createOrder4report(params) {
-    if (!Array.isArray(params.acceptedOffers)) {
-        throw new factory_1.factory.errors.ArgumentNull('order.acceptedOffers');
-    }
-    const numItems = params.acceptedOffers.length;
-    // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
-    const acceptedOffers = (Array.isArray(params.acceptedOffers))
-        ? params.acceptedOffers.map((o) => {
-            if (o.itemOffered.typeOf === factory_1.factory.reservationType.EventReservation) {
-                let itemOffered = o.itemOffered;
-                const reservationFor = itemOffered.reservationFor;
-                itemOffered = {
-                    ...itemOffered,
-                    reservationFor: {
-                        ...reservationFor,
-                        ...(reservationFor.doorTime !== undefined)
-                            ? {
-                                doorTime: (0, moment_timezone_1.default)(reservationFor.doorTime)
-                                    .toDate()
-                            }
-                            : undefined,
-                        ...(reservationFor.endDate !== undefined)
-                            ? {
-                                endDate: (0, moment_timezone_1.default)(reservationFor.endDate)
-                                    .toDate()
-                            }
-                            : undefined,
-                        ...(reservationFor.startDate !== undefined)
-                            ? {
-                                startDate: (0, moment_timezone_1.default)(reservationFor.startDate)
-                                    .toDate()
-                            }
-                            : undefined
-                    }
-                };
-                return {
-                    ...o,
-                    itemOffered
-                };
-            }
-            else {
-                return o;
-            }
-        })
-        : [];
-    const customer = {
-        // ...createMaskedCustomer(params),
-        id: params.customer.id,
-        typeOf: params.customer.typeOf,
-        additionalProperty: (Array.isArray(params.customer.additionalProperty))
-            ? params.customer.additionalProperty
-            : [],
-        identifier: (Array.isArray(params.customer.identifier))
-            ? params.customer.identifier
-            : []
-    };
+    // if (!Array.isArray(params.acceptedOffers)) {
+    //     throw new factory.errors.ArgumentNull('order.acceptedOffers');
+    // }
+    // const numItems: number = params.acceptedOffers.length;
+    // // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
+    // const acceptedOffers = (Array.isArray(params.acceptedOffers))
+    //     ? params.acceptedOffers.map((o) => {
+    //         if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
+    //             let itemOffered = o.itemOffered;
+    //             const reservationFor = itemOffered.reservationFor;
+    //             itemOffered = {
+    //                 ...itemOffered,
+    //                 reservationFor: {
+    //                     ...reservationFor,
+    //                     ...(reservationFor.doorTime !== undefined)
+    //                         ? {
+    //                             doorTime: moment(reservationFor.doorTime)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined,
+    //                     ...(reservationFor.endDate !== undefined)
+    //                         ? {
+    //                             endDate: moment(reservationFor.endDate)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined,
+    //                     ...(reservationFor.startDate !== undefined)
+    //                         ? {
+    //                             startDate: moment(reservationFor.startDate)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined
+    //                 }
+    //             } as factory.order.IReservation;
+    //             return {
+    //                 ...o,
+    //                 itemOffered
+    //             };
+    //         } else {
+    //             return o;
+    //         }
+    //     })
+    //     : [];
+    // const customer: factory.report.accountingReport.IOptimizedCustomer = {
+    //     id: params.customer.id,
+    //     typeOf: params.customer.typeOf,
+    //     additionalProperty: (Array.isArray(params.customer.additionalProperty))
+    //         ? params.customer.additionalProperty
+    //         : [],
+    //     identifier: (Array.isArray(params.customer.identifier))
+    //         ? params.customer.identifier
+    //         : []
+    // };
     return {
-        // ...params,
-        confirmationNumber: params.confirmationNumber,
         id: params.id,
         orderNumber: params.orderNumber,
-        orderedItem: params.orderedItem,
-        paymentMethods: params.paymentMethods,
-        price: params.price,
-        priceCurrency: params.priceCurrency,
-        seller: params.seller,
+        paymentMethods: params.paymentMethods.map(({ paymentMethodId }) => ({ paymentMethodId })),
+        seller: {
+            id: params.seller.id,
+            name: params.seller.name,
+            typeOf: params.seller.typeOf
+        },
         typeOf: params.typeOf,
-        customer,
         orderDate: (0, moment_timezone_1.default)(params.orderDate)
             .toDate(),
-        acceptedOffers,
-        numItems,
-        ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined
-        // ...(params.dateReturned !== null && params.dateReturned !== undefined)
-        //     ? {
-        //         dateReturned: moment(params.dateReturned)
-        //             .toDate()
-        //     }
-        //     : undefined
+        // confirmationNumber: params.confirmationNumber, // discontinue(2026-05-06~)
+        // price: params.price, // discontinue(2026-05-06~)
+        // priceCurrency: params.priceCurrency, // discontinue(2026-05-06~)
+        // customer, // discontinue(2026-05-06~)
+        // numItems, // discontinue(2026-05-06~)
+        // orderedItem: params.orderedItem, // discontinue(2026-05-06~)
+        // acceptedOffers, // discontinue(2026-05-06~)
+        // ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined // discontinue(2026-05-06~)
     };
 }
 function createAccountingReport(params) {

package/lib/chevre/service/reserve/useReservation.d.ts

@@ -20,7 +20,7 @@ export declare function useReservation(params: {
          */
         id: string;
     };
-    instrument?: Pick<factory.action.consume.use.reservation.ITicketAsInstrument, 'ticketToken'> | factory.action.consume.use.reservation.IInstrument[];
+    instrument: factory.action.consume.use.reservation.IInstrument[];
     location?: {
         identifier?: string;
     };

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

@@ -16,7 +16,6 @@ function useReservation(params) {
     return async (repos) => {
         const reservationId = params.object.id;
         let ticketToken;
-        // const ticketToken = params?.instrument?.ticketToken;
         if (Array.isArray(params.instrument)) {
             for (const eachInstrument of params.instrument) {
                 if (eachInstrument.typeOf === 'Ticket' && typeof eachInstrument.ticketToken === 'string') {
@@ -24,9 +23,8 @@ function useReservation(params) {
                     break;
                 }
             }
-        }
-        else {
-            ticketToken = params?.instrument?.ticketToken;
+            // } else {
+            //     ticketToken = params?.instrument?.ticketToken;
         }
         // if (params.verifyToken === true) {} // タスク作成前に検証済なので検証不要
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
@@ -34,36 +32,34 @@ function useReservation(params) {
         // 予約検索
         const reservation = await repos.reservation.findReservationById({
             id: reservationId,
-            inclusion: ['issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
+            inclusion: [
+                // 'issuedThrough',
+                // 'reservedTicket',
+                'project', 'reservationFor', 'reservationNumber', 'typeOf'
+            ]
         });
-        if (typeof reservation.issuedThrough.id !== 'string') {
-            // COA予約では予約使用アクションを想定していないので、興行idは必ず存在するはず
-            throw new factory_1.factory.errors.Internal('reservation.issuedThrough.id must be string');
-        }
-        const { reservedTicket } = reservation;
-        // optimize(2024-05-07~)
+        // if (typeof reservation.issuedThrough.id !== 'string') {
+        //     // COA予約では予約使用アクションを想定していないので、興行idは必ず存在するはず
+        //     throw new factory.errors.Internal('reservation.issuedThrough.id must be string');
+        // }
+        // const { reservedTicket } = reservation;
+        // optimize(2026-05-06~)
         const reservationAsObject = {
             id: reservation.id,
             reservationNumber: reservation.reservationNumber,
             typeOf: reservation.typeOf,
-            issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
             reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
-            reservedTicket: {
-                typeOf: reservedTicket.typeOf,
-                // discontinue ticketType(2026-03-25~)
-                // ticketType: {
-                //     identifier: reservedTicket.ticketType.identifier,
-                //     typeOf: reservedTicket.ticketType.typeOf,
-                //     ...(typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined
-                // },
-                ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
-                ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
-            }
+            // discontinue issuedThrough,reservedTicket(2026-05-06~)
+            // issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
+            // reservedTicket: {
+            //     typeOf: reservedTicket.typeOf,
+            //     ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
+            //     ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
+            // }
         };
         // extend instrument to array(2025-02-18~)
         const instrument = [
             {
-                // ...(typeof token === 'string') ? { token } : undefined, // discontinue token(2024-10-03~)
                 ...(typeof ticketToken === 'string') ? { ticketToken } : undefined,
                 typeOf: 'Ticket'
             },

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

@@ -27,9 +27,12 @@ function createAccountingReport(params) {
             orderNumber: data.object.mainEntity.orderNumber,
             project: { id: params.project.id },
             inclusion: [
-                'orderNumber', 'project', 'customer', 'confirmationNumber',
-                'paymentMethods', 'orderedItem', 'price', 'priceCurrency', 'seller', 'broker', 'typeOf', 'orderDate'
-            ] // explicit projection(2024-07-25~)
+                'orderNumber', 'project', 'paymentMethods', 'seller', 'typeOf', 'orderDate'
+                // 'customer', 'confirmationNumber',
+                // 'orderedItem',
+                // 'broker',
+                // 'price', 'priceCurrency',
+            ]
         });
         const simpleOrder = {
             typeOf: order.typeOf,
@@ -37,7 +40,6 @@ function createAccountingReport(params) {
             orderDate: order.orderDate
         };
         const actionObject = {
-            // ...params,
             mainEntity: { orderNumber: simpleOrder.orderNumber },
             typeOf: 'Report'
         };
@@ -51,13 +53,13 @@ function createAccountingReport(params) {
         };
         const action = await repos.action.start(actionAttributes);
         try {
-            const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                orderNumber: { $eq: data.object.mainEntity.orderNumber },
-                project: { id: { $eq: params.project.id } }
-            });
+            // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            //     orderNumber: { $eq: data.object.mainEntity.orderNumber },
+            //     project: { id: { $eq: params.project.id } }
+            // });
             await (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)({
                 ...order,
-                acceptedOffers
+                // acceptedOffers
             })(repos);
         }
         catch (error) {

package/lib/chevre/service/task/useReservation.d.ts

@@ -1,6 +1,6 @@
+import type { IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.useReservation.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.useReservation.ITask, IExecutableTaskKeys>): IOperationExecute<void>;

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

@@ -12,25 +12,15 @@ const useReservation_1 = require("../reserve/useReservation");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
-        let instrument;
-        // support array(2025-02-17~)
-        if (Array.isArray(data.instrument)) {
-            instrument = data.instrument;
-        }
-        else {
-            if (data.instrument?.typeOf === 'Ticket') {
-                instrument = [data.instrument];
-            }
-        }
+        const { data, project } = params;
         await (0, useReservation_1.useReservation)({
-            project: data.project,
+            project,
             agent: data.agent,
             object: data.object,
-            instrument,
-            // ...(typeof data.instrument?.typeOf === 'string') ? { instrument: data.instrument } : undefined,
-            ...(typeof data.location?.typeOf === 'string') ? { location: data.location } : undefined
+            instrument: data.instrument,
+            ...(typeof data.location?.identifier === 'string') ? { location: data.location } : undefined
         })({
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -39,8 +29,6 @@ function call(data) {
             reservation: new reservation_1.ReservationRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
-        }
-        // settings
-        );
+        });
     };
 }

package/lib/chevre/service/taskHandler.js

@@ -74,6 +74,7 @@ function executeTask(task, next) {
                 case factory_1.factory.taskName.SendEmailMessage:
                 case factory_1.factory.taskName.SyncResourcesFromCOA:
                 case factory_1.factory.taskName.TriggerWebhook:
+                case factory_1.factory.taskName.UseReservation:
                     callResult = await call(task)(settings, options);
                     break;
                 default:

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "8.0.0",
+    "@chevre/factory": "8.1.0-alpha.4",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.1"
+  "version": "24.1.0-alpha.10"
 }

package/lib/chevre/repo/mongoose/schemas/productModel.d.ts

@@ -1,33 +0,0 @@
-import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
-import { IVirtuals } from '../virtuals';
-import { factory } from '../../../factory';
-export interface IProductModel {
-    id: string;
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    typeOf: 'ProductModel';
-    category: Pick<factory.categoryCode.ICategoryCode, 'codeValue' | 'inCodeSet'> & {
-        /**
-         * 区分ID
-         * 削除時同期に必要
-         */
-        id: string;
-    };
-    name: factory.multilingualString;
-    offers: {
-        typeOf: factory.offerType.Offer;
-        eligibleCustomerType?: {
-            codeValue: string;
-        }[];
-    }[];
-}
-type IDocType = Omit<IProductModel, 'id'>;
-type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
-type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;
-declare const modelName = "ProductModel";
-declare const indexes: [d: IndexDefinition, o: IndexOptions][];
-declare function createSchema(): ISchema;
-export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.modelName = exports.indexes = void 0;
-exports.createSchema = createSchema;
-const mongoose_1 = require("mongoose");
-const writeConcern_1 = require("../writeConcern");
-const settings_1 = require("../../../settings");
-const modelName = 'ProductModel';
-exports.modelName = modelName;
-const schemaDefinition = {
-    project: mongoose_1.SchemaTypes.Mixed,
-    typeOf: { type: String, required: true },
-    category: mongoose_1.SchemaTypes.Mixed,
-    name: mongoose_1.SchemaTypes.Mixed,
-    offers: mongoose_1.SchemaTypes.Mixed
-};
-const schemaOptions = {
-    autoIndex: settings_1.MONGO_AUTO_INDEX,
-    autoCreate: false,
-    collection: 'productModels',
-    id: true,
-    read: settings_1.MONGO_READ_PREFERENCE,
-    writeConcern: writeConcern_1.writeConcern,
-    strict: true,
-    strictQuery: false,
-    timestamps: false, // 2024-09-03~
-    versionKey: false, // 2024-09-03~
-    toJSON: {
-        getters: false,
-        virtuals: false,
-        minimize: false,
-        versionKey: false
-    },
-    toObject: {
-        getters: false,
-        virtuals: true,
-        minimize: false,
-        versionKey: false
-    }
-};
-const indexes = [];
-exports.indexes = indexes;
-/**
- * プロダクトモデルスキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-        if (settings_1.MONGO_AUTO_INDEX) {
-            indexes.forEach((indexParams) => {
-                schema?.index(...indexParams);
-            });
-        }
-    }
-    return schema;
-}