@chevre/domain 26.0.0-alpha.34 → 26.0.0-alpha.35

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

@@ -3,7 +3,7 @@ import { factory } from '../../factory';
 import { IModel as IActionModel } from '../mongoose/schemas/action';
 import { IModel as IActionRecipeModel } from '../mongoose/schemas/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 | factory.action.check.thing.IAction) : T extends factory.actionType.CreateAction ? factory.action.create.IAction : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
+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>>;
 export interface ICancelActionAction {
     typeOf: factory.actionType.CancelAction;
     agent: factory.action.IParticipantAsPerson | factory.action.IParticipantAsProject | factory.action.IParticipantAsWebApplication;

package/lib/chevre/repository.d.ts

@@ -12,7 +12,6 @@ import type { AuthorizeOfferActionRepo } from './repo/action/authorizeOffer';
 import type { AuthorizePaymentMethodActionRepo } from './repo/action/authorizePaymentMethod';
 import type { AuthorizeTicketedObjectActionRepo } from './repo/action/authorizeTicketedObject';
 import type { CheckMovieTicketActionRepo } from './repo/action/checkMovieTicket';
-import type { CheckThingActionRepo } from './repo/action/checkThing';
 import type { InformActionRepo } from './repo/action/inform';
 import type { PayActionRepo } from './repo/action/pay';
 import type { RefundActionRepo } from './repo/action/refund';
@@ -157,10 +156,6 @@ export declare namespace action {
     namespace CheckMovieTicket {
         function createInstance(...params: ConstructorParameters<typeof CheckMovieTicketActionRepo>): Promise<CheckMovieTicketActionRepo>;
     }
-    type CheckThing = CheckThingActionRepo;
-    namespace CheckThing {
-        function createInstance(...params: ConstructorParameters<typeof CheckThingActionRepo>): Promise<CheckThingActionRepo>;
-    }
     type Pay = PayActionRepo;
     namespace Pay {
         function createInstance(...params: ConstructorParameters<typeof PayActionRepo>): Promise<PayActionRepo>;

package/lib/chevre/repository.js

@@ -125,17 +125,6 @@ var action;
         }
         CheckMovieTicket.createInstance = createInstance;
     })(CheckMovieTicket = action.CheckMovieTicket || (action.CheckMovieTicket = {}));
-    let CheckThing;
-    (function (CheckThing) {
-        let repo;
-        async function createInstance(...params) {
-            if (repo === undefined) {
-                repo = (await import('./repo/action/checkThing.js')).CheckThingActionRepo;
-            }
-            return new repo(...params);
-        }
-        CheckThing.createInstance = createInstance;
-    })(CheckThing = action.CheckThing || (action.CheckThing = {}));
     let Pay;
     (function (Pay) {
         let repo;

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

@@ -134,9 +134,7 @@ function createCheckResourceTask(order) {
         object: {
             orderNumber: order.orderNumber,
             typeOf: order.typeOf
-        },
-        // project: order.project,
-        typeOf: factory_1.factory.actionType.CheckAction
+        }
     };
     const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.CheckResource, order.typeOf, order.orderNumber);
     return {

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

@@ -3,72 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
-const checkThing_1 = require("../../repo/action/checkThing");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
-const setting_1 = require("../../repo/setting");
-const stockHolder_1 = require("../../repo/stockHolder");
-const task_1 = require("../../repo/task");
-const validateEvent_1 = require("../validation/validateEvent");
 const validateOrder_1 = require("../validation/validateOrder");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }) => {
-        if (redisClient === undefined) {
-            throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
-        }
-        const actionRepo = new checkThing_1.CheckThingActionRepo(connection);
+    return async ({ connection }) => {
         const { data } = params;
-        const actionAttributes = {
-            agent: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-            object: data.object,
-            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-            typeOf: factory_1.factory.actionType.CheckAction,
-            sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-22~)
-        };
-        const action = await actionRepo.start(actionAttributes);
         const objectTypeOf = data.object.typeOf;
-        try {
-            switch (objectTypeOf) {
-                case factory_1.factory.order.OrderType.Order:
-                    await (0, validateOrder_1.validateOrder)({
-                        orderNumber: data.object.orderNumber,
-                        project: { id: params.project.id }
-                    })({
-                        acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
-                        assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
-                        order: new order_1.OrderRepo(connection),
-                        setting: new setting_1.SettingRepo(connection),
-                        task: new task_1.TaskRepo(connection)
-                    });
-                    break;
-                // support ScreeningEvent(2025-05-01~)
-                case factory_1.factory.eventType.ScreeningEvent:
-                    await (0, validateEvent_1.validateEvent)({
-                        id: data.object.id,
-                        project: { id: params.project.id }
-                    })({
-                        event: new event_1.EventRepo(connection),
-                        stockHolder: new stockHolder_1.StockHolderRepo({ connection })
-                    });
-                    break;
-                default:
-                    throw new factory_1.factory.errors.NotImplemented(`${objectTypeOf} not implemented`);
-            }
-        }
-        catch (error) {
-            try {
-                await actionRepo.giveUp({ typeOf: action.typeOf, id: action.id, error });
-            }
-            catch (__) {
-                // 失敗したら仕方ない
-            }
-            throw error;
+        switch (objectTypeOf) {
+            case factory_1.factory.order.OrderType.Order:
+                await (0, validateOrder_1.validateOrder)({
+                    orderNumber: data.object.orderNumber,
+                    project: { id: params.project.id }
+                })({
+                    acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
+                    assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+                    order: new order_1.OrderRepo(connection),
+                });
+                break;
+            default:
+                throw new factory_1.factory.errors.NotImplemented(`${objectTypeOf} not implemented`);
         }
-        const actionResult = {}; // eslint-disable-line @typescript-eslint/no-explicit-any
-        await actionRepo.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     };
 }

package/lib/chevre/service/validation/validateOrder.d.ts

@@ -1,8 +1,6 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { OrderRepo } from '../../repo/order';
-import type { SettingRepo } from '../../repo/setting';
-import type { TaskRepo } from '../../repo/task';
 export declare function validateOrder(params: {
     orderNumber: string;
     project: {
@@ -12,6 +10,4 @@ export declare function validateOrder(params: {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
-    setting: SettingRepo;
-    task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/validation/validateOrder.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOrder = validateOrder;
 // import createDebug from 'debug';
 const moment_1 = __importDefault(require("moment"));
+// import type { SettingRepo } from '../../repo/setting';
 const factory_1 = require("../../factory");
 const factory_2 = require("../offer/event/authorize/factory");
-// import { acceptedOffers2amount as acceptedOffers2amount4product } from '../offer/product/factory';
 const validateMovieTicket_1 = require("../transaction/placeOrder/confirm/validation/validateMovieTicket");
 function validateOrder(params) {
     return async (repos) => {

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.8",
+    "@chevre/factory": "10.3.0-alpha.9",
     "@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.34"
+  "version": "26.0.0-alpha.35"
 }

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

@@ -1,8 +0,0 @@
-import { factory } from '../../factory';
-import { ActionProcessRepo } from './actionProcess';
-export type ICheckThingAction = factory.action.check.thing.IAction;
-/**
- * 汎用リソース検証アクションリポジトリ
- */
-export declare class CheckThingActionRepo extends ActionProcessRepo<ICheckThingAction, never> {
-}

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

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CheckThingActionRepo = 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");
-/**
- * 汎用リソース検証アクションリポジトリ
- */
-class CheckThingActionRepo extends actionProcess_1.ActionProcessRepo {
-}
-exports.CheckThingActionRepo = CheckThingActionRepo;

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

@@ -1,25 +0,0 @@
-import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
-import { factory } from '../../../factory';
-import { IVirtuals } from '../virtuals';
-interface IAggregateReservation {
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    typeOf: 'AggregateReservation';
-    reservationCount: number;
-    reservationFor: {
-        id: string;
-        startDate: Date;
-    };
-    reservationIds: string[];
-    expires: Date;
-}
-type IDocType = IAggregateReservation;
-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 = "PendingReservationAggregate";
-declare const indexes: [d: IndexDefinition, o: IndexOptions][];
-declare function createSchema(): ISchema;
-export { createSchema, IDocType, IModel, IAggregateReservation, indexes, modelName };

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

@@ -1,100 +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 settings_1 = require("../../../settings");
-const writeConcern_1 = require("../writeConcern");
-const modelName = 'PendingReservationAggregate';
-exports.modelName = modelName;
-const schemaDefinition = {
-    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    typeOf: { type: String, required: true },
-    expires: { type: Date, required: true },
-    reservationCount: { type: Number, required: true },
-    reservationFor: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    reservationIds: [mongoose_1.SchemaTypes.Mixed]
-};
-const schemaOptions = {
-    autoIndex: settings_1.MONGO_AUTO_INDEX,
-    autoCreate: false,
-    collection: 'pendingReservationAggregates',
-    id: true,
-    read: settings_1.MONGO_READ_PREFERENCE,
-    writeConcern: writeConcern_1.writeConcern,
-    strict: true,
-    strictQuery: false,
-    timestamps: false,
-    versionKey: false,
-    toJSON: {
-        getters: false,
-        virtuals: false,
-        minimize: false,
-        versionKey: false
-    },
-    toObject: {
-        getters: false,
-        virtuals: true,
-        minimize: false,
-        versionKey: false
-    }
-};
-const indexes = [
-    [
-        { expires: -1 },
-        { name: 'expires' }
-    ],
-    // [
-    //     { 'project.id': 1, expires: -1 },
-    //     { name: 'projectId' }
-    // ],
-    // [
-    //     { 'reservationFor.id': 1, expires: -1 },
-    //     { name: 'reservationForId' }
-    // ],
-    // [
-    //     { reservationIds: 1, expires: -1 },
-    //     { name: 'reservationIds' }
-    // ], // このindexで性能下がる？
-    // [
-    //     { reservationIds: 1 },
-    //     { name: 'reservationIds' }
-    // ], // このindexで性能下がる？
-    [
-        { 'reservationFor.id': 1 },
-        {
-            unique: true,
-            name: 'uniqueReservationForId'
-        }
-    ],
-    [
-        {
-            'reservationFor.id': 1,
-            reservationCount: 1
-        },
-        { name: 'increaseReservationCount' }
-    ],
-    [
-        {
-            'reservationFor.id': 1,
-            reservationIds: 1
-        },
-        { name: 'decreaseReservationCount' }
-    ]
-];
-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;
-}

package/lib/chevre/service/validation/validateEvent.d.ts

@@ -1,11 +0,0 @@
-import type { EventRepo } from '../../repo/event';
-import type { StockHolderRepo } from '../../repo/stockHolder';
-export declare function validateEvent(__: {
-    id: string;
-    project: {
-        id: string;
-    };
-}): (__2: {
-    event: EventRepo;
-    stockHolder: StockHolderRepo;
-}) => Promise<void>;

package/lib/chevre/service/validation/validateEvent.js

@@ -1,21 +0,0 @@
-"use strict";
-// import createDebug from 'debug';
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateEvent = validateEvent;
-// import { factory } from '../../factory';
-// const debug = createDebug('chevre-domain:service:validation');
-function validateEvent(__) {
-    return async (__2) => {
-        // const event: Pick<factory.event.screeningEvent.IEvent, 'id' | 'startDate'> =
-        //     await repos.event.projectEventFieldsById(
-        //         { id: params.id },
-        //         ['startDate']
-        //     );
-        // discontinue redis(2025-08-17~)
-        // debug('validateEvent: conflicted?', params.project.id, event.id, event.startDate);
-        // await repos.stockHolder.checkIfConflicted({
-        //     eventId: event.id,
-        //     startDate: event.startDate
-        // });
-    };
-}