@chevre/domain 22.1.0-alpha.1 → 22.1.0-alpha.2

package/example/src/chevre/searchOrders.ts

@@ -57,8 +57,7 @@ async function main() {
                 price: 1, priceCurrency: 1, project: 1,
                 // seller: 1,
                 typeOf: 1
-            },
-            exclusion: {}
+            }
         }
     );
     // tslint:disable-next-line:no-null-keyword

package/example/src/chevre/updateEventPartiallyById.ts

@@ -0,0 +1,22 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import { chevre } from '../../../lib/index';
+
+const PROJECT_ID = String(process.env.PROJECT_ID);
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventRepo: chevre.repository.Event = await chevre.repository.Event.createInstance(mongoose.connection);
+
+    const result = await eventRepo.updatePartiallyById<chevre.factory.eventType.ScreeningEvent>({
+        project: { id: PROJECT_ID },
+        id: 'blxd1grxw',
+        attributes: { typeOf: chevre.factory.eventType.ScreeningEvent, eventStatus: chevre.factory.eventStatusType.EventScheduled }
+    });
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -134,7 +134,7 @@ export declare class EventRepo {
         };
         id: string;
         attributes: IAttributes4patchUpdate<T>;
-    }): Promise<factory.event.IEvent<T>>;
+    }): Promise<void>;
     /**
      * イベントを保管する
      */
@@ -146,7 +146,9 @@ export declare class EventRepo {
          */
         $unset?: IUnset<T>;
         upsert?: boolean;
-    }): Promise<factory.event.IEvent<T>>;
+    }): Promise<{
+        id: string;
+    }>;
     saveMany<T extends factory.eventType>(params: {
         id: string;
         attributes: factory.event.IAttributes<T>;
@@ -156,7 +158,9 @@ export declare class EventRepo {
     save4ttts(params: {
         oldEventId: string;
         attributes: factory.event.IAttributes<factory.eventType.ScreeningEvent>;
-    }): Promise<factory.event.IEvent<factory.eventType.ScreeningEvent>>;
+    }): Promise<{
+        id: string;
+    }>;
     /**
      * イベントを検索する
      */

package/lib/chevre/repo/event.js

@@ -683,20 +683,24 @@ class EventRepo {
      */
     updatePartiallyById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let doc;
+            // let doc: Document | null;
             const _a = params.attributes, { typeOf } = _a, updateFields = __rest(_a, ["typeOf"]);
-            doc = yield this.eventModel.findOneAndUpdate({
-                _id: params.id,
+            if (typeof typeOf !== 'string' || typeOf.length === 0) {
+                throw new factory.errors.ArgumentNull('attributes.typeOf');
+            }
+            const doc = yield this.eventModel.findOneAndUpdate({
+                _id: { $eq: params.id },
                 'project.id': { $eq: params.project.id },
-                typeOf: params.attributes.typeOf
+                typeOf: { $eq: typeOf }
             }, {
                 $set: updateFields
-            }, { upsert: false, new: true })
+            }, { upsert: false, new: false, projection: { _id: 1 } })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
             }
-            return doc.toObject();
+            // return doc.toObject(); // void化(2024-07-31~)
         });
     }
     /**
@@ -704,24 +708,31 @@ class EventRepo {
      */
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            let savedEventId;
             let doc;
+            const _a = params.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
+            if (typeof typeOf !== 'string' || typeOf.length === 0) {
+                throw new factory.errors.ArgumentNull('attributes.typeOf');
+            }
             try {
                 if (params.id === undefined) {
                     const uniqid = yield Promise.resolve().then(() => require('uniqid'));
                     const id = uniqid();
                     doc = yield this.eventModel.create(Object.assign(Object.assign({}, params.attributes), { _id: id }));
+                    savedEventId = id;
                 }
                 else {
                     const upsert = params.upsert === true;
-                    // 上書き禁止属性を除外(2022-08-24~)
-                    const _a = params.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
                     doc = yield this.eventModel.findOneAndUpdate({
-                        _id: params.id,
-                        typeOf: params.attributes.typeOf
-                    }, Object.assign({ $setOnInsert: Object.assign(Object.assign({ typeOf: params.attributes.typeOf }, (params.attributes.project !== undefined)
-                            ? { project: params.attributes.project } : undefined), (params.attributes.identifier !== undefined)
-                            ? { identifier: params.attributes.identifier } : undefined), $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert, new: true })
+                        _id: { $eq: params.id },
+                        typeOf: { $eq: typeOf }
+                    }, Object.assign({ 
+                        // 上書き禁止属性を除外(2022-08-24~)
+                        $setOnInsert: Object.assign({ typeOf,
+                            project }, (identifier !== undefined) ? { identifier } : undefined), $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert, new: true, projection: { _id: 1 } })
+                        .lean()
                         .exec();
+                    savedEventId = params.id;
                 }
             }
             catch (error) {
@@ -735,7 +746,8 @@ class EventRepo {
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
             }
-            return doc.toObject();
+            return { id: savedEventId }; // optimize(2024-07-31~)
+            // return doc.toObject();
         });
     }
     saveMany(params) {
@@ -787,13 +799,13 @@ class EventRepo {
     }
     save4ttts(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let doc;
+            // let doc: Document | null;
             const _a = params.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const id = uniqid();
-            doc = yield this.eventModel.findOneAndUpdate({
-                'project.id': { $eq: params.attributes.project.id },
-                typeOf: params.attributes.typeOf,
+            const doc = yield this.eventModel.findOneAndUpdate({
+                'project.id': { $eq: project.id },
+                typeOf: { $eq: typeOf },
                 // 追加特性をキーに更新
                 additionalProperty: {
                     $exists: true,
@@ -802,18 +814,17 @@ class EventRepo {
             }, 
             // upsertの場合、createがありうるので属性を除外しない
             {
-                $setOnInsert: Object.assign(Object.assign({ _id: id, typeOf: params.attributes.typeOf }, (params.attributes.project !== undefined)
-                    ? { project: params.attributes.project } : undefined), (params.attributes.identifier !== undefined)
-                    ? { identifier: params.attributes.identifier } : undefined),
+                $setOnInsert: Object.assign({ _id: id, typeOf,
+                    project }, (identifier !== undefined) ? { identifier } : undefined),
                 $set: updateFields
-                // $unsetに対応
-                // ...(params.$unset !== undefined) ? { $unset: params.$unset } : undefined
-            }, { upsert: true, new: true })
+            }, { upsert: true, new: true, projection: { _id: 1 } })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
             }
-            return doc.toObject();
+            return { id: doc._id }; // optimize(2024-07-31~)
+            // return <factory.event.IEvent<factory.eventType.ScreeningEvent>>doc.toObject();
         });
     }
     /**

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

@@ -155,12 +155,6 @@ export declare class OrderRepo {
         inclusion: {
             [key in IKeyOfProjection]?: 1;
         };
-        /**
-         * @deprecated use inclusion
-         */
-        exclusion: {
-            [key in IKeyOfProjection]?: 0;
-        };
     }): Promise<(IOrderWithoutAcceptedOffers & {
         id: string;
     })[]>;

package/lib/chevre/repo/order.js

@@ -996,7 +996,7 @@ class OrderRepo {
     options) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { inclusion, exclusion } = options;
+            const { inclusion } = options;
             const conditions = OrderRepo.CREATE_MONGO_CONDITIONS(params);
             let useInclusionProjection = false;
             let projectStage = {};
@@ -1022,7 +1022,14 @@ class OrderRepo {
                 });
             }
             else {
-                projectStage = Object.assign({ __v: 0, createdAt: 0, updatedAt: 0, acceptedOffers: 0 }, exclusion);
+                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+                // projectStage = {
+                //     __v: 0,
+                //     createdAt: 0,
+                //     updatedAt: 0,
+                //     acceptedOffers: 0, // defaultで隠蔽(2023-12-06~)
+                //     ...exclusion
+                // };
             }
             const query = this.orderModel.find((conditions.length > 0) ? { $and: conditions } : {}, projectStage);
             // .select(projectStage);

package/lib/chevre/service/assetTransaction/pay.js

@@ -469,7 +469,7 @@ function confirm(params) {
             project: { id: { $eq: transaction.project.id } },
             confirmationNumbers: [confirmationNumber],
             orderNumbers: [orderNumber]
-        }, { inclusion: { orderNumber: 1 }, exclusion: {} });
+        }, { inclusion: { orderNumber: 1 } });
         if (existingOrders.length === 0) {
             throw new factory.errors.NotFound(factory.order.OrderType.Order);
         }

package/lib/chevre/service/assetTransaction/reserve/confirm.js

@@ -81,7 +81,7 @@ function fixOrderAsPurpose(params, transaction) {
                 project: { id: { $eq: transaction.project.id } },
                 confirmationNumbers: [payPurposeConfirmationNumber],
                 orderNumbers: [payPurposeOrderNumber]
-            }, { inclusion: { customer: 1, orderNumber: 1, typeOf: 1 }, exclusion: {} });
+            }, { inclusion: { customer: 1, orderNumber: 1, typeOf: 1 } });
             order = orders.shift();
             if (order === undefined) {
                 throw new factory.errors.NotFound('Order as purpose');

package/lib/chevre/service/event.js

@@ -787,9 +787,9 @@ function updateEvent4ttts(params) {
             }
         });
         const action = yield repos.action.start(actionAttributes);
-        let event;
+        let savedEvent;
         try {
-            event = yield repos.event.save4ttts({
+            savedEvent = yield repos.event.save4ttts({
                 oldEventId: params.oldEventId,
                 attributes: params.attributes
             });
@@ -804,11 +804,11 @@ function updateEvent4ttts(params) {
             throw error;
         }
         // アクション完了
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: { id: event.id } });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: { id: savedEvent.id } });
         yield (0, onEventChanged_1.onEventChanged)({
-            id: [event.id],
-            project: { id: event.project.id },
-            typeOf: event.typeOf,
+            id: [savedEvent.id],
+            project: { id: params.project.id },
+            typeOf: factory.eventType.ScreeningEvent,
             isNew: false,
             useInform: true
         })({

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

@@ -20,7 +20,7 @@ function deleteOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const orders = yield repos.order.search({
             orderNumbers: [params.object.orderNumber]
-        }, { inclusion: { orderDate: 1, project: 1, customer: 1, orderNumber: 1, seller: 1 }, exclusion: {} });
+        }, { inclusion: { orderDate: 1, project: 1, customer: 1, orderNumber: 1, seller: 1 } });
         const order = orders.shift();
         if (order === undefined) {
             // すでに削除済

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

@@ -281,7 +281,7 @@ function cancelOrderIfExist(params) {
                 paymentMethodIds: [params.paymentMethodId]
             },
             project: { id: { $eq: params.project.id } }
-        }, { inclusion: { confirmationNumber: 1, orderNumber: 1 }, exclusion: {} });
+        }, { inclusion: { confirmationNumber: 1, orderNumber: 1 } });
         const orderByPaymentMethodId = ordersByPaymentMethodId.shift();
         if (orderByPaymentMethodId !== undefined) {
             const placeOrderTransaction = yield (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({

package/lib/chevre/service/payment.js

@@ -27,7 +27,7 @@ function fixOrderAsPurpose(params, transaction) {
             project: { id: { $eq: transaction.project.id } },
             confirmationNumbers: [payPurposeConfirmationNumber],
             orderNumbers: [payPurposeOrderNumber]
-        }, { inclusion: { typeOf: 1, confirmationNumber: 1, orderNumber: 1 }, exclusion: {} });
+        }, { inclusion: { typeOf: 1, confirmationNumber: 1, orderNumber: 1 } });
         const orderWithoutAcceptedOffers = ordersWithoutAcceptedOffers.shift();
         if (orderWithoutAcceptedOffers === undefined) {
             throw new factory.errors.NotFound('Order as purpose');
@@ -65,7 +65,7 @@ function payTask2payActionAttributes(params) {
                 limit: 1,
                 page: 1,
                 orderNumbers: [params.purpose.object.orderNumber]
-            }, { inclusion: { seller: 1, project: 1 }, exclusion: {} })).shift();
+            }, { inclusion: { seller: 1, project: 1 } })).shift();
             if (order === undefined) {
                 throw new factory.errors.NotFound(factory.order.OrderType.Order);
             }

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

@@ -44,7 +44,7 @@ function searchByOrder(params) {
                         limit: 1,
                         page: 1,
                         orderNumbers: [params.orderNumber]
-                    }, { inclusion: { customer: 1 }, exclusion: {} })).shift();
+                    }, { inclusion: { customer: 1 } })).shift();
                     if (order === undefined) {
                         throw new factory.errors.NotFound(factory.order.OrderType.Order);
                     }

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

@@ -122,7 +122,7 @@ function fixOrderAsPurpose(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             orderNumbers: [purposeOrderNumber]
-        }, { inclusion: { customer: 1, orderNumber: 1, typeOf: 1 }, exclusion: {} });
+        }, { inclusion: { customer: 1, orderNumber: 1, typeOf: 1 } });
         order = orders.shift();
         if (order === undefined) {
             throw new factory.errors.NotFound('Order as purpose');

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

@@ -70,7 +70,7 @@ function fixOrderAndTransaction(params) {
             limit: 1,
             page: 1,
             paymentMethods: { paymentMethodIds: [paymentMethodId] }
-        }, { inclusion: { orderNumber: 1 }, exclusion: {} })).shift();
+        }, { inclusion: { orderNumber: 1 } })).shift();
         if (orderByPaymentMethodId === undefined) {
             throw new factory.errors.NotFound(factory.order.OrderType.Order);
         }

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -407,8 +407,7 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                     orderNumbers: [String(fromLocation.orderNumber)],
                     confirmationNumbers: [String(fromLocation.confirmationNumber)]
                 }, {
-                    inclusion: { identifier: 1, orderStatus: 1 },
-                    exclusion: {}
+                    inclusion: { identifier: 1, orderStatus: 1 }
                 });
                 const order = orders.shift();
                 if (order === undefined) {
@@ -464,8 +463,7 @@ function validateToLocation(project, toLocationBeforeStart, issuedThrough) {
                 }, {
                     inclusion: {
                         identifier: 1
-                    },
-                    exclusion: {}
+                    }
                 });
                 const order = orders.shift();
                 if (order === undefined) {

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -131,8 +131,7 @@ function fixOrders(params) {
             inclusion: {
                 confirmationNumber: 1, dateReturned: 1, orderDate: 1, orderNumber: 1, orderStatus: 1,
                 paymentMethods: 1, price: 1, project: 1, seller: 1, typeOf: 1
-            },
-            exclusion: {}
+            }
         }
         // {
         //     // acceptedOffers: 0, // カスタム返品ポリシーに必要

package/lib/chevre/service/transaction/returnOrder.js

@@ -111,8 +111,7 @@ function confirm(params) {
             inclusion: {
                 confirmationNumber: 1, customer: 1, identifier: 1, orderDate: 1, orderNumber: 1, orderStatus: 1,
                 orderedItem: 1, paymentMethods: 1, price: 1, priceCurrency: 1, project: 1, seller: 1, typeOf: 1
-            },
-            exclusion: {}
+            }
         });
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderReturned;

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.1.0-alpha.1"
+  "version": "22.1.0-alpha.2"
 }