@chevre/domain 26.0.0-alpha.37 → 26.0.0-alpha.39

package/lib/chevre/repo/action/acceptCOAOffer.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcceptCOAOfferActionRepo = void 0;
 const factory_1 = require("../../factory");
-// import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
 const actionProcess_1 = require("./actionProcess");
 /**
  * COAオファー採用リポジトリ

package/lib/chevre/repo/action/acceptPay.js

@@ -2,9 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcceptPayActionRepo = void 0;
 const factory_1 = require("../../factory");
-// import { MONGO_MAX_TIME_MS } from '../../settings';
-// import { createSchema, IModel as IActionModel, modelName } from './mongoose/schemas/action';
-// import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
 const actionProcess_1 = require("./actionProcess");
 /**
  * 決済採用リポジトリ

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

@@ -1,9 +1,10 @@
 import { Connection } from 'mongoose';
 import { factory } from '../../factory';
-import { IModel as IActionModel } from '../mongoose/schemas/action';
+import { IModel as IActionModel, IDocType } from '../mongoose/schemas/action';
 import { ActionRecipeRepo, IActionRecipe, IRecipeAsActionAttributes } from './actionRecipe';
 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.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 : T extends factory.actionType.CreateAction ? factory.action.create.IAction : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
+type IAuthorizeAction = factory.action.authorize.invoice.IAction | factory.action.authorize.offer.eventService.IAction | factory.action.authorize.paymentMethod.any.IAction | factory.action.authorize.ticketedObject.IAction;
+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 ? IAuthorizeAction : T extends factory.actionType.CheckAction ? factory.action.check.paymentMethod.movieTicket.IAction : T extends factory.actionType.CreateAction ? factory.action.create.IAction : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
 export interface ICancelActionAction {
     typeOf: factory.actionType.CancelAction;
     agent: factory.action.IParticipantAsPerson | factory.action.IParticipantAsProject | factory.action.IParticipantAsWebApplication;
@@ -15,7 +16,7 @@ export interface ICancelActionAction {
     };
 }
 export { IActionRecipe };
-export type IKeyOfProjection = keyof IAction<factory.actionType> | keyof IAction<factory.actionType.AuthorizeAction> | keyof IAction<factory.actionType.ReplaceAction> | 'identifier';
+export type IKeyOfProjection = keyof IDocType | 'id';
 export declare const AVAILABLE_PROJECT_FIELDS: IKeyOfProjection[];
 /**
  * アクション状態管理リポジトリ

package/lib/chevre/repo/action/actionProcess.js

@@ -26,6 +26,7 @@ exports.AVAILABLE_PROJECT_FIELDS = [
     'cancelAction',
     'about',
     'identifier',
+    'expires'
 ];
 const DEFAULT_EXPIRE_AFTER_SECONDS = 17280000; // 200 days
 const RECIPE_DEFAULT_EXPIRE_AFTER_SECONDS = 17280000; // 200 days

package/lib/chevre/repo/action/authorizeInvoice.js

@@ -2,9 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthorizeInvoiceActionRepo = void 0;
 const factory_1 = require("../../factory");
-// import { MONGO_MAX_TIME_MS } from '../settings';
-// import { createSchema, IModel as IActionModel, modelName } from './mongoose/schemas/action';
-// import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
 const actionProcess_1 = require("./actionProcess");
 /**
  * インボイス承認リポジトリ

package/lib/chevre/repo/action/authorizeOffer.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthorizeOfferActionRepo = void 0;
 const factory_1 = require("../../factory");
-// import { MONGO_MAX_TIME_MS } from '../settings';
 const actionProcess_1 = require("./actionProcess");
 /**
  * オファー承認リポジトリ

package/lib/chevre/repo/action/authorizePaymentMethod.js

@@ -2,9 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthorizePaymentMethodActionRepo = void 0;
 const factory_1 = require("../../factory");
-// import { MONGO_MAX_TIME_MS } from '../../settings';
-// import { createSchema, IModel as IActionModel, modelName } from './mongoose/schemas/action';
-// import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
 const actionProcess_1 = require("./actionProcess");
 /**
  * 決済承認リポジトリ

package/lib/chevre/repo/action/authorizeTicketedObject.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthorizeTicketedObjectActionRepo = void 0;
-// import { MONGO_MAX_TIME_MS } from '../settings';
 const actionProcess_1 = require("./actionProcess");
 /**
  * 決済とオファー以外に対する汎用承認リポジトリ

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

@@ -0,0 +1,8 @@
+import { factory } from '../../factory';
+import { ActionProcessRepo } from './actionProcess';
+export type ICreateAction = factory.action.create.IAction;
+/**
+ * レポート作成アクションリポジトリ
+ */
+export declare class CreateActionRepo extends ActionProcessRepo<ICreateAction, never> {
+}

package/lib/chevre/repo/action/create.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreateActionRepo = void 0;
+const actionProcess_1 = require("./actionProcess");
+/**
+ * レポート作成アクションリポジトリ
+ */
+class CreateActionRepo extends actionProcess_1.ActionProcessRepo {
+}
+exports.CreateActionRepo = CreateActionRepo;

package/lib/chevre/repo/action/pay.js

@@ -2,9 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PayActionRepo = void 0;
 const factory_1 = require("../../factory");
-// import { MONGO_MAX_TIME_MS } from '../settings';
-// import { createSchema, IModel as IActionModel, modelName } from './mongoose/schemas/action';
-// import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
 const actionProcess_1 = require("./actionProcess");
 /**
  * 決済アクションリポジトリ

package/lib/chevre/repo/action/refund.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefundActionRepo = void 0;
-// import { MONGO_MAX_TIME_MS } from '../settings';
-// import { createSchema, IModel as IActionModel, modelName } from './mongoose/schemas/action';
-// import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
 const actionProcess_1 = require("./actionProcess");
 /**
  * 返金アクションリポジトリ

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

@@ -4,7 +4,7 @@ export { ICancelActionAction };
 /**
  * 汎用アクションリポジトリで開始可能なアクションタイプ
  */
-export type StartableActionType = Exclude<factory.actionType, factory.actionType.AcceptAction | factory.actionType.CheckAction | factory.actionType.AuthorizeAction | factory.actionType.PayAction | factory.actionType.RefundAction | factory.actionType.AddAction | factory.actionType.UpdateAction | factory.actionType.ReplaceAction | factory.actionType.DeleteAction | factory.actionType.InformAction | factory.actionType.UseAction>;
+export type StartableActionType = Exclude<factory.actionType, factory.actionType.AcceptAction | factory.actionType.CheckAction | factory.actionType.AuthorizeAction | factory.actionType.PayAction | factory.actionType.RefundAction | factory.actionType.AddAction | factory.actionType.UpdateAction | factory.actionType.ReplaceAction | factory.actionType.DeleteAction | factory.actionType.InformAction | factory.actionType.UseAction | factory.actionType.CreateAction>;
 export type IAvailableActionRecipe = IActionRecipe<Exclude<factory.recipe.RecipeCategory, factory.recipe.RecipeCategory.publishPaymentUrl | factory.recipe.RecipeCategory.checkMovieTicket | factory.recipe.RecipeCategory.acceptCOAOffer | factory.recipe.RecipeCategory.authorizeInvoice | factory.recipe.RecipeCategory.authorizeInvoice3ds | factory.recipe.RecipeCategory.payCreditCard | factory.recipe.RecipeCategory.payMovieTicket | factory.recipe.RecipeCategory.refundCreditCard | factory.recipe.RecipeCategory.refundMovieTicket>>;
 /**
  * アクションリポジトリ

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

@@ -57,6 +57,16 @@ const schemaOptions = {
     }
 };
 const indexes = [
+    [
+        { expires: 1 },
+        {
+            name: 'expires',
+            expireAfterSeconds: 0,
+            partialFilterExpression: {
+                expires: { $exists: true }
+            }
+        }
+    ],
     [
         { startDate: 1 },
         {

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

@@ -57,6 +57,16 @@ const schemaOptions = {
     }
 };
 const indexes = [
+    [
+        { expires: 1 },
+        {
+            name: 'expires',
+            expireAfterSeconds: 0,
+            partialFilterExpression: {
+                expires: { $exists: true }
+            }
+        }
+    ],
     [
         { dateCreated: 1 },
         {

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

@@ -1,5 +1,5 @@
 import { AccountingReportRepo } from '../../repo/accountingReport';
 import { factory } from '../../factory';
-export declare function createAccountingReportIfNotExist(params: Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'project' | 'paymentMethods' | 'seller' | 'typeOf' | 'orderDate'> & {}): (repos: {
+export declare function createAccountingReportIfNotExist(params: Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'project' | 'paymentMethods' | 'seller' | 'typeOf' | 'orderDate'>): (repos: {
     accountingReport: AccountingReportRepo;
 }) => Promise<void>;

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAccountingReportIfNotExist = createAccountingReportIfNotExist;
-const moment_timezone_1 = __importDefault(require("moment-timezone"));
+const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../factory");
 function createAccountingReportIfNotExist(params) {
     return async (repos) => {
@@ -17,61 +17,7 @@ function createAccountingReportIfNotExist(params) {
         await repos.accountingReport.syncMainEntity(accountingReport);
     };
 }
-// 最適化(2023-06-30~)
 function createOrder4report(params) {
-    // 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 {
         id: params.id,
         orderNumber: params.orderNumber,
@@ -82,7 +28,7 @@ function createOrder4report(params) {
             typeOf: params.seller.typeOf
         },
         typeOf: params.typeOf,
-        orderDate: (0, moment_timezone_1.default)(params.orderDate)
+        orderDate: (0, moment_1.default)(params.orderDate)
             .toDate(),
         // confirmationNumber: params.confirmationNumber, // discontinue(2026-05-06~)
         // price: params.price, // discontinue(2026-05-06~)

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

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
-const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
-const action_1 = require("../../repo/action");
+const create_1 = require("../../repo/action/create");
 const order_1 = require("../../repo/order");
 const createAccountingReportIfNotExist_1 = require("../order/createAccountingReportIfNotExist");
 /**
@@ -13,9 +12,10 @@ const createAccountingReportIfNotExist_1 = require("../order/createAccountingRep
 function call(params) {
     return async ({ connection }) => {
         await createAccountingReport(params)({
-            acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-            action: new action_1.ActionRepo(connection),
+            actions: {
+                create: new create_1.CreateActionRepo(connection)
+            },
             order: new order_1.OrderRepo(connection)
         });
     };
@@ -28,10 +28,6 @@ function createAccountingReport(params) {
             project: { id: params.project.id },
             inclusion: [
                 'orderNumber', 'project', 'paymentMethods', 'seller', 'typeOf', 'orderDate'
-                // 'customer', 'confirmationNumber',
-                // 'orderedItem',
-                // 'broker',
-                // 'price', 'priceCurrency',
             ]
         });
         const simpleOrder = {
@@ -51,16 +47,13 @@ function createAccountingReport(params) {
             purpose: simpleOrder,
             sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-21~)
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.actions.create.start(actionAttributes);
         try {
-            await (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)({
-                ...order,
-                // acceptedOffers
-            })(repos);
+            await (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)(repos);
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.create.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -68,6 +61,6 @@ function createAccountingReport(params) {
             throw error;
         }
         const result = {};
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await repos.actions.create.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
     };
 }

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.3.0-alpha.11",
+    "@chevre/factory": "10.3.0-alpha.12",
     "@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.37"
+  "version": "26.0.0-alpha.39"
 }