@chevre/domain 22.8.0-alpha.24 → 22.8.0-alpha.26

package/example/src/chevre/{searchActions.ts → searchActionsByOrderNumber.ts}

@@ -13,13 +13,11 @@ async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
-    const actions = await actionRepo.search(
+    const actions = await actionRepo.searchByOrderNumber(
         {
-            limit: 3,
-            page: 1,
+            orderNumber: 'CIN6-4292767-6570494',
             sort: { startDate: chevre.factory.sortType.Descending }
-        },
-        ['startDate']
+        }
     );
     console.log('actions:', actions);
 }

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.ReplaceAction ? factory.action.update.replace.IAction<factory.action.update.replace.IAttributes<any, any>> : 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 | factory.action.check.token.IAction) : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction<factory.action.update.replace.IAttributes<any, any>> : T extends factory.actionType.InformAction ? factory.action.interact.inform.IAction<any> : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
 interface IAggregationByStatus {
     actionCount: number;
     avgDuration: number;
@@ -336,100 +336,16 @@ export declare class ActionRepo {
         startFrom: Date;
         startThrough: Date;
     }): Promise<IAggregateAction>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
-        object: any;
-        error?: any;
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.actionType;
-        result?: any;
-        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
-        agent: import("@chevre/factory/lib/action").IParticipant;
-        purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
-        targetCollection?: any;
-        potentialActions?: any;
-        instrument?: any;
-        location?: any;
-        endDate?: Date | undefined;
-        sameAs?: import("@chevre/factory/lib/action").ISameAs | undefined;
-        startDate: Date;
-        description?: string | undefined;
-        amount?: any;
-        fromLocation?: any;
-        toLocation?: any;
-        replacer?: any;
-        cancelAction?: any;
-        actionStatus: factory.actionStatusType;
-    }> & {
-        object: any;
-        error?: any;
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.actionType;
-        result?: any;
-        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
-        agent: import("@chevre/factory/lib/action").IParticipant;
-        purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
-        targetCollection?: any;
-        potentialActions?: any;
-        instrument?: any;
-        location?: any;
-        endDate?: Date | undefined;
-        sameAs?: import("@chevre/factory/lib/action").ISameAs | undefined;
-        startDate: Date;
-        description?: string | undefined;
-        amount?: any;
-        fromLocation?: any;
-        toLocation?: any;
-        replacer?: any;
-        cancelAction?: any;
-        actionStatus: factory.actionStatusType;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, Omit<import("@chevre/factory/lib/action").IAction<import("@chevre/factory/lib/action").IAttributes<factory.actionType, any, any>>, "id"> & {
+        about?: any;
+    }> & Omit<import("@chevre/factory/lib/action").IAction<import("@chevre/factory/lib/action").IAttributes<factory.actionType, any, any>>, "id"> & {
+        about?: any;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, {
-        object: any;
-        error?: any;
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.actionType;
-        result?: any;
-        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
-        agent: import("@chevre/factory/lib/action").IParticipant;
-        purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
-        targetCollection?: any;
-        potentialActions?: any;
-        instrument?: any;
-        location?: any;
-        endDate?: Date | undefined;
-        sameAs?: import("@chevre/factory/lib/action").ISameAs | undefined;
-        startDate: Date;
-        description?: string | undefined;
-        amount?: any;
-        fromLocation?: any;
-        toLocation?: any;
-        replacer?: any;
-        cancelAction?: any;
-        actionStatus: factory.actionStatusType;
-    }> & {
-        object: any;
-        error?: any;
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.actionType;
-        result?: any;
-        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
-        agent: import("@chevre/factory/lib/action").IParticipant;
-        purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
-        targetCollection?: any;
-        potentialActions?: any;
-        instrument?: any;
-        location?: any;
-        endDate?: Date | undefined;
-        sameAs?: import("@chevre/factory/lib/action").ISameAs | undefined;
-        startDate: Date;
-        description?: string | undefined;
-        amount?: any;
-        fromLocation?: any;
-        toLocation?: any;
-        replacer?: any;
-        cancelAction?: any;
-        actionStatus: factory.actionStatusType;
+    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, Omit<import("@chevre/factory/lib/action").IAction<import("@chevre/factory/lib/action").IAttributes<factory.actionType, any, any>>, "id"> & {
+        about?: any;
+    }> & Omit<import("@chevre/factory/lib/action").IAction<import("@chevre/factory/lib/action").IAttributes<factory.actionType, any, any>>, "id"> & {
+        about?: any;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }>>;

package/lib/chevre/repo/action.js

@@ -48,7 +48,8 @@ const AVAILABLE_PROJECT_FIELDS = [
     'replacer',
     'targetCollection',
     'sameAs',
-    'cancelAction'
+    'cancelAction',
+    'about'
 ];
 /**
  * アクションリポジトリ
@@ -461,11 +462,6 @@ class ActionRepo {
             if (Array.isArray(inclusion) && inclusion.length > 0) {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
-            else {
-                // if (Array.isArray(exclusion) && exclusion.length > 0) {
-                //     positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-                // }
-            }
             const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
             const query = this.actionModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
@@ -765,8 +761,10 @@ class ActionRepo {
             var _a;
             const filter = {
                 $or: [
-                    { 'object.orderNumber': { $eq: params.orderNumber } },
-                    { 'purpose.orderNumber': { $eq: params.orderNumber } }
+                    { 'object.orderNumber': { $exists: true, $eq: params.orderNumber } },
+                    { 'purpose.orderNumber': { $exists: true, $eq: params.orderNumber } },
+                    // consider inform returnAction(2025-01-22~)
+                    { 'about.orderNumber': { $exists: true, $eq: params.orderNumber } }
                 ]
             };
             const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(AVAILABLE_PROJECT_FIELDS.map((key) => ([key, 1]))));

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

@@ -1,6 +1,8 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocType = Omit<factory.action.IAction<factory.action.IAttributes<factory.actionType, any, any>>, 'id'>;
+type IDocType = Omit<factory.action.IAction<factory.action.IAttributes<factory.actionType, any, any>>, 'id'> & {
+    about?: any;
+};
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;

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

@@ -29,7 +29,8 @@ const schemaDefinition = {
     replacer: mongoose_1.SchemaTypes.Mixed, // add replacer(2024-03-19~)
     targetCollection: mongoose_1.SchemaTypes.Mixed, // add targetCollection(2024-03-19~)
     sameAs: mongoose_1.SchemaTypes.Mixed, // タスク関連付けのために追加(2024-04-20~)
-    cancelAction: mongoose_1.SchemaTypes.Mixed // add(2024-05-26~)
+    cancelAction: mongoose_1.SchemaTypes.Mixed, // add(2024-05-26~)
+    about: mongoose_1.SchemaTypes.Mixed // add(2025-01-22~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -227,15 +228,15 @@ const indexes = [
             }
         }
     ],
-    // [
-    //     { 'object.acceptedOffer.itemOffered.serviceOutput.reservedTicket.ticketedSeat.seatNumber': 1, startDate: -1 },
-    //     {
-    //         name: 'searchByObjectAcceptedOfferItemOfferedServiceOutputSeatNumber',
-    //         partialFilterExpression: {
-    //             'object.acceptedOffer.itemOffered.serviceOutput.reservedTicket.ticketedSeat.seatNumber': { $exists: true }
-    //         }
-    //     }
-    // ], // discontinue(2024-07-02~)
+    [
+        { 'about.orderNumber': 1, startDate: -1 },
+        {
+            name: 'aboutOrderNumber',
+            partialFilterExpression: {
+                'about.orderNumber': { $exists: true }
+            }
+        }
+    ],
     [
         { 'object.orderNumber': 1, startDate: -1 },
         {

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

@@ -18,6 +18,7 @@ setting) {
         informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
+                about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
                 object: order4inform,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,

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

@@ -23,6 +23,7 @@ setting) {
         informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
+                about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
                 object: order4inform,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,

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

@@ -23,6 +23,7 @@ setting) {
         informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
+                about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
                 object: order4inform,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,

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

@@ -27,6 +27,7 @@ function createInformTasks(order, returnOrderAction, setting) {
         informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
+                about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
                 object: informObject,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,

package/lib/chevre/service/order/onOrderUpdated/factory.js

@@ -16,6 +16,7 @@ setting) {
         informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
+                about: { orderNumber: order4inform.orderNumber, typeOf: factory.order.OrderType.Order },
                 object: order4inform,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,

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.392.0-alpha.17",
+    "@chevre/factory": "4.392.0-alpha.18",
     "@cinerino/sdk": "10.20.0-alpha.10",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.8.0-alpha.24"
+  "version": "22.8.0-alpha.26"
 }