@chevre/domain 21.25.0-alpha.0 → 21.25.0-alpha.2

package/example/src/chevre/searchSlicedAcceptedOffersByOrderNumber.ts

@@ -6,14 +6,17 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
+    const limit = 1;
+    const page = 2;
     const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
 
     const result = await acceptedOfferRepo.searchSlicedAcceptedOffersByOrderNumber(
         {
-            orderNumber: { $eq: 'CIN1-3748070-2008463' },
-            project: { id: { $eq: String(process.env.PROJECT_ID) } },
+            orderNumber: { $eq: 'TTT6-4203485-8379924' },
+            // project: { id: { $eq: String(process.env.PROJECT_ID) } },
+            project: { id: { $eq: 'ttts-development' } },
             // tslint:disable-next-line:no-magic-numbers
-            $slice: [0, 2]
+            $slice: [limit * (page - 1), limit]
         }
     );
     console.log(result);

package/lib/chevre/service/delivery/factory.d.ts

@@ -7,4 +7,5 @@ export declare function createOwnershipInfosFromOrder(params: {
     order: Pick<factory.order.IOrder, 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'> & {
         acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     };
+    offerIndexBase: number;
 }): IOwnershipInfo[];

package/lib/chevre/service/delivery/factory.js

@@ -19,7 +19,12 @@ function createOwnershipInfosFromOrder(params) {
         let ownershipInfo;
         const ownedFrom = moment(params.order.orderDate)
             .toDate();
-        const identifier = createOwnershipInfoIdentifier({ order: params.order, itemOffered, offerIndex });
+        const identifier = createOwnershipInfoIdentifier({
+            order: params.order,
+            itemOffered,
+            offerIndex,
+            offerIndexBase: params.offerIndexBase
+        });
         const acquiredFrom = createAcquiredFrom(params);
         const ownedBy = createOwnedby(params);
         const itemOfferedType = itemOffered.typeOf;
@@ -60,7 +65,7 @@ function createOwnershipInfosFromOrder(params) {
 }
 exports.createOwnershipInfosFromOrder = createOwnershipInfosFromOrder;
 function createOwnershipInfoIdentifier(params) {
-    return util.format('%s-%s-%s-%s', params.order.customer.id, params.itemOffered.typeOf, params.order.orderNumber, params.offerIndex);
+    return util.format('%s-%s-%s-%s', params.order.customer.id, params.itemOffered.typeOf, params.order.orderNumber, (params.offerIndexBase + params.offerIndex));
 }
 function createAcquiredFrom(params) {
     // 最低限の情報に絞る

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

@@ -81,7 +81,8 @@ function deleteOwnershipInfosByOrder(order) {
             order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
                     orderNumber: { $eq: order.orderNumber },
                     project: { id: { $eq: order.project.id } }
-                }) })
+                }) }),
+            offerIndexBase: 0
         });
         const ownershipIdentifiers = ownershipInfos.map((o) => String(o.identifier));
         if (ownershipIdentifiers.length > 0) {

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

@@ -103,15 +103,20 @@ function sendOrder(params) {
                     createOwnerships = true;
             }
             try {
+                const offerIndexBase = (limit * (page - 1));
                 const searchSlicedAcceptedOffersResult = yield repos.acceptedOffer.searchSlicedAcceptedOffersByOrderNumber({
-                    $slice: [limit * (page - 1), limit],
+                    $slice: [offerIndexBase, limit],
                     orderNumber: { $eq: order.orderNumber },
                     project: { id: { $eq: order.project.id } }
                 });
                 acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
+                debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
                 // 所有権作成
                 if (createOwnerships) {
-                    ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order: Object.assign(Object.assign({}, order), { acceptedOffers }) });
+                    ownershipInfos = (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);
                     })));

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": "21.25.0-alpha.0"
+  "version": "21.25.0-alpha.2"
 }