@chevre/domain 21.8.0-alpha.48 → 21.8.0-alpha.49

package/example/src/chevre/migrateAggregateOffers.ts

@@ -34,33 +34,47 @@ async function main() {
             <chevre.factory.unitPriceOffer.IUnitPriceOffer & { _id: string }>doc.toObject();
 
         let alreadyMigrated = false;
-        try {
-            const aggregateOffer = await offerRepo.findAggregateOfferById({
-                project: { id: unitPriceOffer.project.id },
-                id: String(unitPriceOffer.id)
-            });
-            const offerByAggregateOffer = aggregateOffer.offers.shift();
-            // alreadyMigrated = true;
-            console.log(unitPriceOffer, offerByAggregateOffer);
-            if (util.isDeepStrictEqual(unitPriceOffer, offerByAggregateOffer)) {
-                alreadyMigrated = true;
-            }
-        } catch (error) {
-            // no op
+        const aggregateOffer = await offerRepo.findAggregateOfferById({
+            project: { id: unitPriceOffer.project.id },
+            id: String(unitPriceOffer.id)
+        });
+        let offerByAggregateOffer = aggregateOffer.offers.shift();
+        // alreadyMigrated = true;
+        console.log(unitPriceOffer, offerByAggregateOffer);
+
+        // 比較のために補完
+        if (offerByAggregateOffer !== undefined) {
+            offerByAggregateOffer = {
+                ...offerByAggregateOffer,
+                additionalProperty: (Array.isArray(offerByAggregateOffer.additionalProperty))
+                    ? offerByAggregateOffer.additionalProperty : [],
+                addOn: (Array.isArray(offerByAggregateOffer.addOn))
+                    ? offerByAggregateOffer.addOn : [],
+                availableAtOrFrom: (Array.isArray(offerByAggregateOffer.availableAtOrFrom))
+                    ? offerByAggregateOffer.availableAtOrFrom : []
+            };
+            delete (<any>offerByAggregateOffer).$unset;
+        }
+
+        if (util.isDeepStrictEqual(unitPriceOffer, offerByAggregateOffer)) {
+            alreadyMigrated = true;
+        } else {
+            console.error(unitPriceOffer, offerByAggregateOffer);
+            throw new Error('not matched');
         }
 
         if (alreadyMigrated) {
             console.log('already exist.', unitPriceOffer.project.id, unitPriceOffer.id, unitPriceOffer.identifier, i);
         } else {
             console.log('updating...', unitPriceOffer.project.id, unitPriceOffer.id, unitPriceOffer.identifier, i);
-            await offerRepo.saveSyncTask({
-                project: { id: unitPriceOffer.project.id },
-                id: { $in: [String(unitPriceOffer.id)] },
-                identifier: { $in: [] },
-                isDeleted: false,
-                typeOf: chevre.factory.offerType.Offer,
-                options: { emitImmediately: false }
-            });
+            // await offerRepo.saveSyncTask({
+            //     project: { id: unitPriceOffer.project.id },
+            //     id: { $in: [String(unitPriceOffer.id)] },
+            //     identifier: { $in: [] },
+            //     isDeleted: false,
+            //     typeOf: chevre.factory.offerType.Offer,
+            //     options: { emitImmediately: false }
+            // });
             updateCount += 1;
             console.log('updated.', unitPriceOffer.project.id, unitPriceOffer.id, unitPriceOffer.identifier, i);
         }

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

@@ -97,7 +97,9 @@ export declare class MongoRepository {
      * 強制的にoffersコレクションを使用する
      */
     useOffersAsPrimary?: boolean): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
-    save(params: factory.unitPriceOffer.IUnitPriceOffer): Promise<factory.unitPriceOffer.IUnitPriceOffer>;
+    save(params: factory.unitPriceOffer.IUnitPriceOffer & {
+        $unset?: any;
+    }): Promise<factory.unitPriceOffer.IUnitPriceOffer>;
     /**
      * sskts専用オファー保管
      */

package/lib/chevre/repo/offer.js

@@ -918,10 +918,11 @@ class MongoRepository {
             let doc;
             // USE_AGGREGATE_OFFERS_AS_PRIMARY対応(2023-09-05~)
             if (settings_1.USE_AGGREGATE_OFFERS_AS_PRIMARY) {
+                const { $unset } = params, paramsWithoutUnset = __rest(params, ["$unset"]);
                 let savedUnitPriceOffer;
                 if (params.id === '') {
                     const id = uniqid();
-                    savedUnitPriceOffer = Object.assign(Object.assign({}, params), { id });
+                    savedUnitPriceOffer = Object.assign(Object.assign({}, paramsWithoutUnset), { id });
                     const aggregateOffer = {
                         typeOf: factory.offerType.AggregateOffer,
                         project: params.project,
@@ -941,7 +942,7 @@ class MongoRepository {
                         throw new factory.errors.NotFound(factory.offerType.Offer);
                     }
                     // 上書き禁止属性を除外
-                    const { id, identifier, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf"]);
+                    const { id, identifier, project, typeOf } = paramsWithoutUnset, updateFields = __rest(paramsWithoutUnset, ["id", "identifier", "project", "typeOf"]);
                     savedUnitPriceOffer = Object.assign(Object.assign({}, updateFields), { id: originalUnitPriceOffer.id, identifier: originalUnitPriceOffer.identifier, project: originalUnitPriceOffer.project, typeOf: originalUnitPriceOffer.typeOf });
                     doc = yield this.aggregateOfferModel.findOneAndUpdate({ 'offers.id': params.id }, {
                         $set: {

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.8.0-alpha.48"
+  "version": "21.8.0-alpha.49"
 }