@chevre/domain 26.0.0-alpha.32 → 26.0.0-alpha.33

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

@@ -78,10 +78,7 @@ class InformActionRepo {
         return { id, startDate, typeOf: creatingAction.typeOf };
     }
     async completeInformAction(params) {
-        const doc = await this.informActionModel.findOneAndUpdate({
-            _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf }
-        }, {
+        const doc = await this.informActionModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
             $set: {
                 actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
                 result: params.result,
@@ -101,10 +98,7 @@ class InformActionRepo {
         const actionError = Array.isArray(params.error)
             ? params.error.map(unknown2actionError_1.unknown2actionError)
             : (0, unknown2actionError_1.unknown2actionError)(params.error);
-        const doc = await this.informActionModel.findOneAndUpdate({
-            typeOf: { $eq: params.typeOf },
-            _id: { $eq: params.id }
-        }, {
+        const doc = await this.informActionModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
             $set: {
                 actionStatus: factory_1.factory.actionStatusType.FailedActionStatus,
                 error: actionError,

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

@@ -4,23 +4,14 @@ import { IDocType } from '../mongoose/schemas/action/update';
 type StartableActionType = factory.actionType.AddAction | factory.actionType.UpdateAction | factory.actionType.ReplaceAction | factory.actionType.DeleteAction;
 type IAction<T extends StartableActionType> = 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.DeleteAction ? factory.action.update.deleteAction.IAction : never;
 type IKeyOfProjection = keyof IDocType;
-type IFindParams = Pick<factory.action.ISearchConditions, 'limit' | 'page' | 'project' | 'sort' | 'startFrom' | 'startThrough'> & {
-    id?: string;
-    typeOf?: StartableActionType;
-    object?: {
-        id?: string;
-    };
-    result?: {
-        id?: string;
-    };
-};
+type IFindParams = factory.action.update.update.IFindParams;
 /**
  * リソース編集アクションリポジトリ
  */
 export declare class UpdateActionRepo {
     private readonly updateActionModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: IFindParams): FilterQuery<IDocType>[];
+    static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'id' | 'object' | 'project' | 'result' | 'startFrom' | 'startThrough' | 'typeOf'>): FilterQuery<IDocType>[];
     /**
      * アクション開始
      */

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

@@ -6,13 +6,7 @@ type IAction = IDocType & {
     id: string;
 };
 type IKeyOfProjection = keyof IDocType;
-type IFindParams = Pick<factory.action.ISearchConditions, 'limit' | 'page' | 'project' | 'sort' | 'startFrom' | 'startThrough'> & {
-    actionStatus?: factory.actionStatusType;
-    id?: string;
-    object?: {
-        id?: string;
-    };
-};
+type IFindParams = factory.action.consume.use.reservation.IFindParams;
 /**
  * 予約使用アクションリポジトリ
  */
@@ -27,7 +21,6 @@ export declare class UseActionRepo {
     completeUseAction(params: {
         typeOf: StartableActionType;
         id: string;
-        result: factory.action.consume.use.reservation.IResult;
     }): Promise<void>;
     /**
      * アクション失敗
@@ -38,5 +31,9 @@ export declare class UseActionRepo {
         error: Error | Error[] | unknown;
     }): Promise<void>;
     findUseActions(params: IFindParams, inclusion: IKeyOfProjection[]): Promise<IAction[]>;
+    /**
+     * 移行処理
+     */
+    migrateUseAction(params: factory.action.consume.use.reservation.IAction): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};

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

@@ -10,7 +10,6 @@ const AVAILABLE_PROJECT_FIELDS = [
     'actionStatus',
     'typeOf',
     'agent',
-    'result',
     'error',
     'object',
     'startDate',
@@ -72,13 +71,10 @@ class UseActionRepo {
         return { id, startDate, typeOf: creatingAction.typeOf };
     }
     async completeUseAction(params) {
-        const doc = await this.useActionModel.findOneAndUpdate({
-            _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf }
-        }, {
+        const doc = await this.useActionModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
             $set: {
                 actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
-                result: params.result,
+                // result: params.result,
                 endDate: new Date()
             }
         }, { new: false, projection: { _id: 1 } })
@@ -95,10 +91,7 @@ class UseActionRepo {
         const actionError = Array.isArray(params.error)
             ? params.error.map(unknown2actionError_1.unknown2actionError)
             : (0, unknown2actionError_1.unknown2actionError)(params.error);
-        const doc = await this.useActionModel.findOneAndUpdate({
-            typeOf: { $eq: params.typeOf },
-            _id: { $eq: params.id }
-        }, {
+        const doc = await this.useActionModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
             $set: {
                 actionStatus: factory_1.factory.actionStatusType.FailedActionStatus,
                 error: actionError,
@@ -138,5 +131,19 @@ class UseActionRepo {
             .lean() // 2024-08-26~
             .exec();
     }
+    /**
+     * 移行処理
+     */
+    async migrateUseAction(params) {
+        const { id, ...upserting } = params;
+        return this.useActionModel.updateOne({
+            _id: { $eq: id }
+        }, {
+            $setOnInsert: {
+                ...upserting,
+                _id: id
+            }
+        }, { upsert: true });
+    }
 }
 exports.UseActionRepo = UseActionRepo;

package/lib/chevre/repo/mongoose/schemas/action/inform.d.ts

@@ -1,9 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../../virtuals';
 import { factory } from '../../../../factory';
-type IDocType = Pick<factory.action.interact.inform.IAction, 'about' | 'actionStatus' | 'agent' | 'endDate' | 'object' | 'project' | 'recipient' | 'result' | 'startDate' | 'target' | 'typeOf' | 'purpose'> & {
-    error?: any;
-};
+type IDocType = Pick<factory.action.interact.inform.IAction, 'about' | 'actionStatus' | 'agent' | 'endDate' | 'object' | 'project' | 'recipient' | 'result' | 'startDate' | 'target' | 'typeOf' | 'purpose' | 'error'>;
 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>;

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

@@ -58,10 +58,6 @@ const indexes = [
         { 'project.id': 1, startDate: 1 },
         { name: 'projectId' }
     ],
-    [
-        { typeOf: 1, startDate: 1 },
-        { name: 'typeOf' }
-    ],
 ];
 exports.indexes = indexes;
 /**

package/lib/chevre/repo/mongoose/schemas/action/use.d.ts

@@ -1,7 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../../virtuals';
 import { factory } from '../../../../factory';
-type IDocType = Pick<factory.action.consume.use.reservation.IAction, 'actionStatus' | 'agent' | 'endDate' | 'error' | 'instrument' | 'location' | 'object' | 'project' | 'result' | 'startDate' | 'typeOf'>;
+type IDocType = Pick<factory.action.consume.use.reservation.IAction, 'actionStatus' | 'agent' | 'endDate' | 'error' | 'instrument' | 'location' | 'object' | 'project' | 'startDate' | 'typeOf'>;
 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>;

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

@@ -16,7 +16,6 @@ const schemaDefinition = {
     startDate: { type: Date, required: true },
     instrument: mongoose_1.SchemaTypes.Mixed,
     location: mongoose_1.SchemaTypes.Mixed,
-    result: mongoose_1.SchemaTypes.Mixed,
     error: mongoose_1.SchemaTypes.Mixed,
     endDate: Date,
 };

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

@@ -82,7 +82,7 @@ function useReservation(params) {
             }
             throw error;
         }
-        await repos.actions.use.completeUseAction({ typeOf: action.typeOf, id: action.id, result: {} });
+        await repos.actions.use.completeUseAction({ typeOf: action.typeOf, id: action.id });
         await (0, onReservationUsed_1.onReservationUsed)(attendedReservation, {
             ...actionAttributes,
             id: action.id,

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.6",
+    "@chevre/factory": "10.3.0-alpha.7",
     "@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.32"
+  "version": "26.0.0-alpha.33"
 }