@chevre/domain 22.14.0-alpha.13 → 22.14.0-alpha.15

package/example/src/chevre/findReservationByCode.ts

@@ -22,7 +22,6 @@ async function main() {
 
     await (await chevre.service.reserve.createService()).verifyToken4reservation({
         project: { id: project.id },
-        agent: { id: project.id, typeOf: chevre.factory.organizationType.Project },
         reservationId: RESERVATION_ID,
         ticket: {
             ticketToken: CODE

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

@@ -1,8 +1,7 @@
 import type { Connection, PipelineStage } from 'mongoose';
-import { IAccountingReport, IChildReport, IOrder4report } from './mongoose/schemas/accountingReport';
 import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/accountingReport';
 type IMatchStage = PipelineStage.Match;
-export { IAccountingReport, IChildReport, IOrder4report };
 /**
  * 経理レポートリポジトリ
  */
@@ -14,7 +13,7 @@ export declare class AccountingReportRepo {
             id?: string;
         };
     }): IMatchStage[];
-    syncMainEntity(params: IAccountingReport): Promise<void>;
+    syncMainEntity(params: IDocType): Promise<void>;
     /**
      * 注文番号で削除する
      */
@@ -34,7 +33,7 @@ export declare class AccountingReportRepo {
         mainEntity: {
             orderNumber: string;
         };
-        hasPart: IChildReport;
+        hasPart: factory.report.accountingReport.IChildReport;
     }): Promise<void>;
     search(params: factory.report.accountingReport.ISearchConditions & {
         seller?: {
@@ -46,3 +45,4 @@ export declare class AccountingReportRepo {
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
+export {};

package/lib/chevre/repo/accountingReport.js

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountingReportRepo = void 0;
-const accountingReport_1 = require("./mongoose/schemas/accountingReport");
 const errorHandler_1 = require("../errorHandler");
 const factory = require("../factory");
+const accountingReport_1 = require("./mongoose/schemas/accountingReport");
 const DEFAULT_SEARCH_LIMIT = 100;
 /**
  * 経理レポートリポジトリ

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

@@ -2,7 +2,7 @@ import { factory as surfrockFactory } from '@surfrock/sdk';
 import { Connection, FilterQuery, UpdateQuery } from 'mongoose';
 import * as factory from '../factory';
 export type IAction4transaction<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction> = T extends factory.actionType.AcceptAction ? factory.action.accept.coaOffer.IAction | factory.action.accept.pay.IAction : T extends factory.actionType.AuthorizeAction ? (factory.action.authorize.offer.eventService.IAction | factory.action.authorize.offer.moneyTransfer.IAction | factory.action.authorize.offer.product.IAction | factory.action.authorize.paymentMethod.any.IAction) : never;
-export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AcceptAction ? IAction4transaction<factory.actionType.AcceptAction> : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : T extends factory.actionType.CheckAction ? (factory.action.check.paymentMethod.movieTicket.IAction | factory.action.check.token.IAction) : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.AddAction ? factory.action.update.add.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAction : T extends factory.actionType.InformAction ? factory.action.interact.inform.IAction<factory.action.interact.inform.IAttributes<factory.action.interact.inform.IObject>> & {
+export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AcceptAction ? IAction4transaction<factory.actionType.AcceptAction> : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : T extends factory.actionType.CheckAction ? (factory.action.check.paymentMethod.movieTicket.IAction | factory.action.check.thing.IAction) : T extends factory.actionType.CreateAction ? factory.action.create.IAction : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.AddAction ? factory.action.update.add.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAction : T extends factory.actionType.InformAction ? factory.action.interact.inform.IAction<factory.action.interact.inform.IAttributes<factory.action.interact.inform.IObject>> & {
     error?: any;
     purpose?: never;
 } : factory.action.IAction<factory.action.IAttributes<T, any, any>>;

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

@@ -1,19 +1,6 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-export type IOrder4report = factory.report.accountingReport.IOrderAsMainEntity;
-export interface IChildReport {
-    typeOf: 'Report';
-    mainEntity: factory.report.accountingReport.IAction;
-}
-export interface IAccountingReport {
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    typeOf: 'Report';
-    hasPart: IChildReport[];
-    mainEntity: IOrder4report;
-}
+type IAccountingReport = factory.report.accountingReport.IReportDocument;
 type IDocType = IAccountingReport;
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
@@ -21,4 +8,4 @@ type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocT
 declare const modelName = "AccountingReport";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAccountingReportIfNotExist = createAccountingReportIfNotExist;
 const moment = require("moment-timezone");
 const factory = require("../../factory");
-// import { createMaskedCustomer } from '../../factory/order';
 function createAccountingReportIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const order4report = createOrder4report(params);

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js

@@ -116,8 +116,8 @@ function createCreateAccountingReportTask(order) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: { mainEntity: { orderNumber: order.orderNumber } },
-            project: { id: order.project.id }
+            object: { mainEntity: { orderNumber: order.orderNumber } }
+            // project: { id: order.project.id }
         }
     };
     return [task];

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js

@@ -127,7 +127,7 @@ function createCheckResourceTask(order) {
             orderNumber: order.orderNumber,
             typeOf: order.typeOf
         },
-        project: order.project,
+        // project: order.project,
         typeOf: factory.actionType.CheckAction
     };
     const taskIdentifier = util.format('%s:%s:%s:%s', order.project.id, factory.taskName.CheckResource, order.typeOf, order.orderNumber);

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

@@ -28,8 +28,7 @@ function useReservation(params) {
         // const ticketToken = params?.instrument?.ticketToken;
         if (Array.isArray(params.instrument)) {
             for (const eachInstrument of params.instrument) {
-                if (eachInstrument.typeOf === factory.action.check.token.ObjectType.Ticket
-                    && typeof eachInstrument.ticketToken === 'string') {
+                if (eachInstrument.typeOf === 'Ticket' && typeof eachInstrument.ticketToken === 'string') {
                     ticketToken = eachInstrument.ticketToken;
                     break;
                 }
@@ -62,7 +61,7 @@ function useReservation(params) {
         };
         // extend instrument to array(2025-02-18~)
         const instrument = [
-            Object.assign(Object.assign({}, (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }),
+            Object.assign(Object.assign({}, (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: 'Ticket' }),
             // support orderAsInstrument(2025-02-18~)
             ...(Array.isArray(params.instrument))
                 ? params.instrument.filter(({ typeOf }) => typeOf === factory.order.OrderType.Order)

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

@@ -1,4 +1,3 @@
-import * as factory from '../../factory';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
 import type { TicketRepo } from '../../repo/ticket';
@@ -12,7 +11,6 @@ export declare function verifyToken4reservation(params: {
     seller?: {
         id?: string;
     };
-    agent: factory.action.check.token.IAgent;
     reservationId: string;
     ticket: {
         /**

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

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

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

@@ -24,17 +24,19 @@ const validateOrder_1 = require("../validation/validateOrder");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return (_a) => __awaiter(this, [_a], void 0, function* ({ connection, redisClient }) {
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
         const actionRepo = new action_1.ActionRepo(connection);
+        const { data } = params;
         const actionAttributes = {
-            agent: { id: data.project.id, typeOf: factory.organizationType.Project },
+            agent: { id: params.project.id, typeOf: factory.organizationType.Project },
             object: data.object,
-            project: { id: data.project.id, typeOf: factory.organizationType.Project },
-            typeOf: factory.actionType.CheckAction
+            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            typeOf: factory.actionType.CheckAction,
+            sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-22~)
         };
         const action = yield actionRepo.start(actionAttributes);
         const objectTypeOf = data.object.typeOf;
@@ -43,7 +45,7 @@ function call(data) {
                 case factory.order.OrderType.Order:
                     yield (0, validateOrder_1.validateOrder)({
                         orderNumber: data.object.orderNumber,
-                        project: { id: data.project.id }
+                        project: { id: params.project.id }
                     })({
                         acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
                         assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -56,7 +58,7 @@ function call(data) {
                 case factory.eventType.ScreeningEvent:
                     yield (0, validateEvent_1.validateEvent)({
                         id: data.object.id,
-                        project: { id: data.project.id }
+                        project: { id: params.project.id }
                     })({
                         event: new event_1.EventRepo(connection),
                         stockHolder: new stockHolder_1.StockHolderRepo({ connection })

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

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

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

@@ -19,9 +19,9 @@ const createAccountingReportIfNotExist_1 = require("../order/createAccountingRep
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return (_a) => __awaiter(this, [_a], void 0, function* ({ connection }) {
-        yield createAccountingReport(data)({
+        yield createAccountingReport(params)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
@@ -31,8 +31,9 @@ function call(data) {
 }
 function createAccountingReport(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { data } = params;
         const order = yield repos.order.projectFieldsByOrderNumber({
-            orderNumber: params.object.mainEntity.orderNumber,
+            orderNumber: data.object.mainEntity.orderNumber,
             project: { id: params.project.id },
             inclusion: [
                 'orderNumber', 'project', 'customer', 'confirmationNumber',
@@ -41,28 +42,26 @@ function createAccountingReport(params) {
         });
         const simpleOrder = {
             typeOf: order.typeOf,
-            // seller: {
-            //     id: order.seller.id,
-            //     typeOf: order.seller.typeOf,
-            //     name: order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // customer: { typeOf: order.customer.typeOf, id: order.customer.id }, // 廃止(2024-03-06~)
             orderNumber: order.orderNumber,
-            // price: order.price,
-            // priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
+        const actionObject = {
+            // ...params,
+            mainEntity: { orderNumber: simpleOrder.orderNumber },
+            typeOf: 'Report'
+        };
         const actionAttributes = {
             project: { id: params.project.id, typeOf: factory.organizationType.Project },
             typeOf: factory.actionType.CreateAction,
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-            object: Object.assign(Object.assign({}, params), { typeOf: 'Report' }),
-            purpose: simpleOrder
+            object: actionObject,
+            purpose: simpleOrder,
+            sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-21~)
         };
         const action = yield repos.action.start(actionAttributes);
         try {
             const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                orderNumber: { $eq: params.object.mainEntity.orderNumber },
+                orderNumber: { $eq: data.object.mainEntity.orderNumber },
                 project: { id: { $eq: params.project.id } }
             });
             yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(Object.assign(Object.assign({}, order), { acceptedOffers }))(repos);
@@ -76,6 +75,7 @@ function createAccountingReport(params) {
             }
             throw error;
         }
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
+        const result = {};
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
     });
 }

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

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
-const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
@@ -31,7 +30,7 @@ function call(data) {
             instrument = data.instrument;
         }
         else {
-            if (((_b = data.instrument) === null || _b === void 0 ? void 0 : _b.typeOf) === factory.action.check.token.ObjectType.Ticket) {
+            if (((_b = data.instrument) === null || _b === void 0 ? void 0 : _b.typeOf) === 'Ticket') {
                 instrument = [data.instrument];
             }
         }

package/lib/chevre/service/taskHandler.js

@@ -50,6 +50,8 @@ function executeTask(task, next) {
                 case factory.taskName.AuthorizePayment:
                 case factory.taskName.CancelPendingReservation:
                 case factory.taskName.CheckMovieTicket:
+                case factory.taskName.CheckResource:
+                case factory.taskName.CreateAccountingReport:
                 case factory.taskName.DeletePerson:
                 case factory.taskName.HandleNotification:
                 case factory.taskName.ImportEventCapacitiesFromCOA:

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.d.ts

@@ -1,5 +1,4 @@
 import * as factory from '../../../../factory';
-export type IAction = factory.action.IAction<factory.action.IAttributes<factory.actionType, any, any>>;
 /**
  * ポイント特典返却アクションを作成する
  */

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": "4.399.0-alpha.14",
+    "@chevre/factory": "4.399.0-alpha.16",
     "@cinerino/sdk": "12.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.14.0-alpha.13"
+  "version": "22.14.0-alpha.15"
 }