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

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

@@ -17,7 +17,6 @@ export declare class MongoRepository {
     findById(params: {
         id: string;
     }, projection?: any): Promise<IOwnershipInfo>;
-    count(params: factory.ownershipInfo.ISearchConditions): Promise<number>;
     /**
      * 所有権を検索する
      */

package/lib/chevre/repo/ownershipInfo.js

@@ -277,14 +277,12 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            return this.ownershipInfoModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
-                .exec();
-        });
-    }
+    // public async count(params: factory.ownershipInfo.ISearchConditions): Promise<number> {
+    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+    //     return this.ownershipInfoModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
+    //         .setOptions({ maxTimeMS: 10000 })
+    //         .exec();
+    // }
     /**
      * 所有権を検索する
      */

package/lib/chevre/service/offer/eventServiceByCOA/validateAcceptedOffers.js

@@ -29,7 +29,7 @@ function createAppliesToMovieTicket(params) {
         movieTicketTypeChargePriceSpec = {
             typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
             name: { ja: params.ticketInfo.ticketName, en: params.ticketInfo.ticketNameEng },
-            price: Number(params.ticketInfo.addPrice),
+            price: params.ticketInfo.addPrice,
             priceCurrency: factory.priceCurrency.JPY,
             valueAddedTaxIncluded: true,
             appliesToMovieTicket: {
@@ -98,7 +98,7 @@ function createPriceComponent(params) {
             eligibleMonetaryAmount = availableUnitPriceOffer.eligibleMonetaryAmount;
         }
     }
-    const accountsReceivable = (ticketInfo.mvtkSalesPrice > 0) ? ticketInfo.mvtkSalesPrice : ticketInfo.stdPrice;
+    const accountsReceivable = (ticketInfo.mvtkAppPrice > 0) ? ticketInfo.mvtkAppPrice : ticketInfo.stdPrice;
     const unitPriceSpec = Object.assign({ typeOf: factory.priceSpecificationType.UnitPriceSpecification, name: { ja: ticketInfo.ticketName, en: ticketInfo.ticketNameEng }, price: Number(ticketInfo.stdPrice), priceCurrency: factory.priceCurrency.JPY, referenceQuantity: {
             typeOf: 'QuantitativeValue',
             unitCode: factory.unitCode.C62,
@@ -127,24 +127,27 @@ function createPriceComponent(params) {
     }
     // 区分加算料金
     const categoryCodeChargeSpecs = [];
-    if (ticketInfo.addPrice > 0) {
-        categoryCodeChargeSpecs.push({
-            name: {
-                en: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                ja: '加算単価'
-            },
-            price: ticketInfo.addPrice,
-            priceCurrency: factory.priceCurrency.JPY,
-            typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-            appliesToCategoryCode: [],
-            valueAddedTaxIncluded: true
-        });
+    // movieTicketTypeChargePriceSpecにaddPriceが含まれる場合は除く
+    if (movieTicketTypeChargePriceSpec === undefined) {
+        if (ticketInfo.addPrice > 0) {
+            categoryCodeChargeSpecs.push({
+                name: {
+                    en: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                    ja: '加算単価'
+                },
+                price: ticketInfo.addPrice,
+                priceCurrency: factory.priceCurrency.JPY,
+                typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                appliesToCategoryCode: [],
+                valueAddedTaxIncluded: true
+            });
+        }
     }
     if (ticketInfo.spseatAdd1 > 0) {
         categoryCodeChargeSpecs.push({
             name: {
                 en: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                ja: '特別席加算額1'
+                ja: '特別席加算額'
             },
             price: ticketInfo.spseatAdd1,
             priceCurrency: factory.priceCurrency.JPY,
@@ -153,23 +156,35 @@ function createPriceComponent(params) {
             valueAddedTaxIncluded: true
         });
     }
+    // アドオン単価
+    const addOnUnitPriceSpecs = [];
     if (ticketInfo.spseatAdd2 > 0) {
-        categoryCodeChargeSpecs.push({
-            name: {
-                en: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                ja: '特別席加算額2'
-            },
+        addOnUnitPriceSpecs.push({
+            typeOf: factory.priceSpecificationType.UnitPriceSpecification,
+            name: { ja: 'ミールクーポン', en: 'Meal Coupon' },
             price: ticketInfo.spseatAdd2,
             priceCurrency: factory.priceCurrency.JPY,
-            typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-            appliesToCategoryCode: [],
-            valueAddedTaxIncluded: true
+            referenceQuantity: {
+                typeOf: 'QuantitativeValue',
+                unitCode: factory.unitCode.C62,
+                value: 1
+            },
+            valueAddedTaxIncluded: true,
+            appliesToAddOn: [{
+                    typeOf: factory.offerType.Offer,
+                    // id?: string;
+                    // identifier?: string;
+                    itemOffered: {
+                        // id: '',
+                        name: { ja: 'ミールクーポン', en: 'Meal Coupon' },
+                        productID: '',
+                        typeOf: factory.product.ProductType.Product
+                    }
+                }]
         });
     }
-    // アドオン単価仕様
-    let addOnUnitPriceSpec;
     if (ticketInfo.addGlasses > 0) {
-        addOnUnitPriceSpec = {
+        addOnUnitPriceSpecs.push({
             typeOf: factory.priceSpecificationType.UnitPriceSpecification,
             name: { ja: 'メガネ', en: 'Glasses' },
             price: Number(ticketInfo.addGlasses),
@@ -186,19 +201,19 @@ function createPriceComponent(params) {
                     // identifier?: string;
                     itemOffered: {
                         // id: '',
-                        // name :'',
+                        name: { ja: 'メガネ', en: 'Glasses' },
                         productID: '',
                         typeOf: factory.product.ProductType.Product
                     }
                 }]
-        };
+        });
     }
     const priceComponent = [
         unitPriceSpec,
         ...(movieTicketTypeChargePriceSpec !== undefined) ? [movieTicketTypeChargePriceSpec] : [],
         ...(surfrockChargePriceSpec !== undefined) ? [surfrockChargePriceSpec] : [],
         ...categoryCodeChargeSpecs,
-        ...(addOnUnitPriceSpec !== undefined) ? [addOnUnitPriceSpec] : []
+        ...addOnUnitPriceSpecs
     ];
     return { priceComponent, eligibleMonetaryAmount };
 }

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@chevre/factory": "4.302.0",
-    "@cinerino/sdk": "3.149.0",
+    "@cinerino/sdk": "3.150.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.9.0-alpha.0"
+  "version": "20.9.0-alpha.2"
 }