@chevre/domain 22.2.0-alpha.4 → 22.2.0-alpha.5

package/example/src/chevre/{projectReservationFieldsById.ts → projectOwnershipInfoFieldsById.ts}

@@ -8,12 +8,12 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
-    const result = await reservationRepo.projectFieldsById(
+    const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
+    const result = await ownershipInfoRepo.projectFieldsById(
         {
-            id: '948926445022844-0',
-            inclusion: ['reservationStatus', 'reservationFor.id']
+            id: 'd9080760-1bdb-49cf-86eb-50f98fab0010'
         }
+        // ['id', 'typeOfGood']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });

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

@@ -35,10 +35,12 @@ export declare class OwnershipInfoRepo {
     /**
      * なければ作成する
      */
-    createIfNotExistByIdentifier(ownershipInfo: IOwnershipInfo): Promise<IOwnershipInfo>;
-    findById(params: {
+    createIfNotExistByIdentifier(ownershipInfo: IOwnershipInfo): Promise<{
         id: string;
-    }, projection?: any): Promise<IOwnershipInfo>;
+    }>;
+    projectFieldsById(params: {
+        id: string;
+    }, inclusion?: (keyof IOwnershipInfo)[]): Promise<IOwnershipInfo>;
     /**
      * 所有権を検索する
      */

package/lib/chevre/repo/ownershipInfo.js

@@ -233,11 +233,14 @@ class OwnershipInfoRepo {
                     new: true,
                     upsert: true,
                     projection: {
-                        __v: 0,
-                        createdAt: 0,
-                        updatedAt: 0
+                        _id: 0,
+                        id: { $toString: '$_id' }
+                        // __v: 0,
+                        // createdAt: 0,
+                        // updatedAt: 0
                     }
                 })
+                    .lean()
                     .exec();
             }
             catch (error) {
@@ -254,26 +257,50 @@ class OwnershipInfoRepo {
             if (duplicate) {
                 // 重複の場合、再度取得
                 doc = yield this.ownershipInfoModel.findOne({ identifier: { $eq: ownershipInfo.identifier } }, {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                    // __v: 0,
+                    // createdAt: 0,
+                    // updatedAt: 0
                 })
+                    .lean()
                     .exec();
             }
             if (doc === undefined || doc === null) {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
-            return doc.toObject();
+            return { id: doc.id };
+            // return <IOwnershipInfo>doc.toObject();
         });
     }
-    findById(params, projection) {
+    projectFieldsById(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.ownershipInfoModel.findById(params.id, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            let projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: 1,
+                typeOf: 1,
+                identifier: 1,
+                ownedBy: 1,
+                acquiredFrom: 1,
+                ownedFrom: 1,
+                ownedThrough: 1,
+                typeOfGood: 1
+            };
+            const positiveProjectionFields = (Array.isArray(inclusion))
+                ? inclusion.filter((key) => key !== 'id' && String(key) !== '_id')
+                : undefined;
+            if (Array.isArray(positiveProjectionFields)) {
+                projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            }
+            const doc = yield this.ownershipInfoModel.findOne({ _id: { $eq: params.id } }, projection)
+                .lean() // lean(2024-08-15~)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
-            return doc.toObject();
+            return doc;
+            // return doc.toObject();
         });
     }
     /**

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

@@ -86,7 +86,8 @@ function sendOrder(params) {
                 typeOf: factory.actionType.SendAction
             };
             const action = yield repos.action.start(sendOrderActionAttributes);
-            let ownershipInfos = [];
+            let creatingOwnershipInfos = [];
+            let createdOwnershipInfos = [];
             let allOffersDelivered = false;
             let acceptedOffers;
             // 所有権生成を最小化(2024-03-01~)
@@ -111,12 +112,15 @@ function sendOrder(params) {
                 debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
                 // 所有権作成
                 if (createOwnerships) {
-                    ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
+                    creatingOwnershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
                         order: Object.assign(Object.assign({}, order), { acceptedOffers }),
                         offerIndexBase
                     });
-                    ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
-                        return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
+                    createdOwnershipInfos = yield Promise.all(creatingOwnershipInfos.map((creatingOwnershipInfo) => __awaiter(this, void 0, void 0, function* () {
+                        const { id } = yield repos.ownershipInfo.createIfNotExistByIdentifier(creatingOwnershipInfo);
+                        return Object.assign({ id }, (typeof creatingOwnershipInfo.identifier === 'string')
+                            ? { identifier: creatingOwnershipInfo.identifier }
+                            : undefined);
                     })));
                 }
                 // const deliveredCount = limit * page;
@@ -140,7 +144,7 @@ function sendOrder(params) {
                 }
                 throw error;
             }
-            const result = ownershipInfos;
+            const result = createdOwnershipInfos;
             yield repos.action.completeWithVoid({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
             debug('allOffersDelivered?:', allOffersDelivered, order.orderNumber);
             if (params.useOnOrderStatusChanged) {

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

@@ -70,7 +70,7 @@ function onAuthorizationCreated(params) {
                 // 所有権検索
                 const ownershipInfoId = authorization.object.id;
                 if (typeof ownershipInfoId === 'string' && ownershipInfoId.length > 0) {
-                    const ownershipInfo = yield repos.ownershipInfo.findById({ id: ownershipInfoId });
+                    const ownershipInfo = yield repos.ownershipInfo.projectFieldsById({ id: ownershipInfoId }, ['typeOfGood']);
                     // 座席予約に対する所有権であれば発券
                     if (ownershipInfo.typeOfGood.typeOf === factory.reservationType.EventReservation
                         || ownershipInfo.typeOfGood.typeOf === factory.reservationType.BusReservation) {

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.381.0-alpha.4",
+    "@chevre/factory": "4.381.0-alpha.5",
     "@cinerino/sdk": "10.5.0-alpha.1",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.2.0-alpha.4"
+  "version": "22.2.0-alpha.5"
 }