@chevre/domain 21.8.0-alpha.37 → 21.8.0-alpha.39

package/example/src/chevre/pullAddOnsFromOffer.ts

@@ -0,0 +1,26 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const offerRepo = new chevre.repository.Offer(mongoose.connection);
+
+    const result = await offerRepo.pullAddOns({
+        project: { id: String(process.env.PROJECT_ID) },
+        addOn: {
+            itemOffered: {
+                id: {
+                    $in: ['xxx']
+                }
+            }
+        }
+    });
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/repo/offer.js

@@ -1158,10 +1158,14 @@ class MongoRepository {
                 }, { id: 1 });
                 const result = yield this.aggregateOfferModel.updateMany(conditions, {
                     $pull: {
-                        'offers.addOn': {
+                        'offers.$[offer].addOn': {
                             'itemOffered.id': { $in: params.addOn.itemOffered.id.$in }
                         }
                     }
+                }, {
+                    arrayFilters: [
+                        { 'offer.addOn.itemOffered.id': { $exists: true, $in: params.addOn.itemOffered.id.$in } }
+                    ]
                 })
                     .exec();
                 // 同期タスク作成(2023-09-05~)
@@ -1319,11 +1323,11 @@ class MongoRepository {
                     const bulkWriteOps = [];
                     if (unitPriceOffers.length > 0) {
                         unitPriceOffers.forEach((unitPriceOffer) => {
-                            delete unitPriceOffer._id;
+                            const { _id } = unitPriceOffer, settingUnitPriceOffer = __rest(unitPriceOffer, ["_id"]);
                             const $set = {
                                 project: unitPriceOffer.project,
                                 typeOf: factory.offerType.AggregateOffer,
-                                offers: [unitPriceOffer]
+                                offers: [settingUnitPriceOffer]
                             };
                             bulkWriteOps.push({
                                 updateOne: {

package/lib/chevre/service/offer/event/authorize.js

@@ -301,44 +301,40 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
             transaction: params.transaction
         });
         const acceptedAppliesToMovieTicket = (_a = offerWithoutDetail.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToMovieTicket;
-        // let movieTicketIdentifire: string | undefined;
-        // if (Array.isArray(acceptedAppliesToMovieTicket)) {
-        //     // throw new factory.errors.NotImplemented('multiple appliesToMovieTicket not implemented');
-        //     // no op
-        // } else if (typeof acceptedAppliesToMovieTicket?.identifier === 'string') {
-        //     movieTicketIdentifire = acceptedAppliesToMovieTicket.identifier;
-        // }
         // 承認アクションオブジェクトのacceptedOfferにappliesToMovieTicketを連携する(2022-08-02~)
         const priceSpecification = Object.assign(Object.assign({}, offer.priceSpecification), (Array.isArray(acceptedAppliesToMovieTicket) || typeof (acceptedAppliesToMovieTicket === null || acceptedAppliesToMovieTicket === void 0 ? void 0 : acceptedAppliesToMovieTicket.identifier) === 'string')
             ? { appliesToMovieTicket: acceptedAppliesToMovieTicket }
             : undefined);
+        const acceptedAddOns = (Array.isArray(offerWithoutDetail.addOn))
+            ? offerWithoutDetail.addOn.map((acceptedAddOnOffer) => {
+                var _a, _b;
+                if (typeof acceptedAddOnOffer.id !== 'string' || acceptedAddOnOffer.id.length === 0) {
+                    throw new factory.errors.ArgumentNull('object.acceptedOffer.addOn.id');
+                }
+                const addOnOfferReferenceQuantityValue = (_b = (_a = acceptedAddOnOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.referenceQuantity) === null || _b === void 0 ? void 0 : _b.value;
+                return Object.assign({ 
+                    // typeOf: <factory.offerType.Offer>factory.offerType.Offer,
+                    id: acceptedAddOnOffer.id }, (typeof addOnOfferReferenceQuantityValue === 'number')
+                    ? { priceSpecification: { referenceQuantity: { value: addOnOfferReferenceQuantityValue } } }
+                    : undefined);
+            })
+            : [];
         const acceptedOffer = {
             // オファーの中身を最適化する(必要最低限の情報のみに)
             id: String(offer.id),
             identifier: offer.identifier,
             priceSpecification,
-            // project: offer.project,
             typeOf: offer.typeOf,
             priceCurrency: offer.priceCurrency,
             itemOffered: Object.assign({ typeOf: factory.product.ProductType.EventService, serviceOutput: (offerWithoutDetail.itemOffered !== undefined && offerWithoutDetail.itemOffered !== null)
                     ? offerWithoutDetail.itemOffered.serviceOutput
                     : undefined }, (pointAward !== undefined) ? { pointAward } : undefined),
-            addOn: (Array.isArray(offerWithoutDetail.addOn))
-                ? offerWithoutDetail.addOn.map((a) => {
-                    return {
-                        typeOf: factory.offerType.Offer,
-                        id: String(a.id),
-                        priceCurrency: offer.priceCurrency
-                    };
-                })
-                : [],
+            addOn: acceptedAddOns,
             // 追加属性をマージ
             additionalProperty: [
                 ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],
                 ...(Array.isArray(offer.additionalProperty)) ? offer.additionalProperty : []
             ]
-            // movieTicketIdentifireの不要を確認後に廃止(2022-09-09以降)(2022-11-02+)
-            // ...(typeof movieTicketIdentifire === 'string') ? { movieTicketIdentifire } : undefined
         };
         let offeredThrough = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.offeredThrough;
         if (typeof (offeredThrough === null || offeredThrough === void 0 ? void 0 : offeredThrough.typeOf) !== 'string') {

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.329.0-alpha.7",
-    "@cinerino/sdk": "3.166.0-alpha.7",
+    "@chevre/factory": "4.329.0-alpha.8",
+    "@cinerino/sdk": "3.166.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -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.37"
+  "version": "21.8.0-alpha.39"
 }