@chevre/domain 20.8.0 → 20.9.0-alpha.1

package/example/src/chevre/searchTransactions.ts

@@ -0,0 +1,25 @@
+// 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);
+
+    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
+
+    const transactions = await transactionRepo.search({
+        limit: 100,
+        page: 1,
+        typeOf: chevre.factory.transactionType.PlaceOrder,
+        result: { order: { confirmationNumber: { $eq: '96275' } } },
+        inclusion: ['result'],
+        exclusion: []
+    });
+    console.log(transactions);
+    console.log(transactions.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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/repo/transaction.d.ts

@@ -145,7 +145,10 @@ export declare class MongoRepository {
     /**
      * 取引を検索する
      */
-    search<T extends factory.transactionType>(params: factory.transaction.ISearchConditions<T>): Promise<factory.transaction.ITransaction<T>[]>;
+    search<T extends factory.transactionType>(params: factory.transaction.ISearchConditions<T> & {
+        inclusion: string[];
+        exclusion: string[];
+    }): Promise<factory.transaction.ITransaction<T>[]>;
     /**
      * 特定の取引を更新する(汎用)
      */

package/lib/chevre/repo/transaction.js

@@ -571,8 +571,26 @@ class MongoRepository {
     search(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            let projection = {};
+            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                params.inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                    params.exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
             const query = this.transactionModel.find((conditions.length > 0) ? { $and: conditions } : {})
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 });
+                .select(projection);
             if (typeof params.limit === 'number') {
                 const page = (typeof params.page === 'number') ? params.page : 1;
                 query.limit(params.limit)

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

@@ -48,6 +48,7 @@ function createAppliesToMovieTicket(params) {
     }
     return { movieTicketTypeChargePriceSpec, appliesToMovieTicket };
 }
+// tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createPriceComponent(params) {
     var _a, _b, _c, _d, _e, _f, _g;
     const acceptedOffer = params.acceptedOffer;
@@ -97,11 +98,15 @@ function createPriceComponent(params) {
             eligibleMonetaryAmount = availableUnitPriceOffer.eligibleMonetaryAmount;
         }
     }
+    const accountsReceivable = (ticketInfo.mvtkSalesPrice > 0) ? ticketInfo.mvtkSalesPrice : 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,
             value: 1
-        }, valueAddedTaxIncluded: true }, (appliesToMovieTicket !== undefined || appliesToMovieTicket4surfrock !== undefined)
+        }, valueAddedTaxIncluded: true, accounting: {
+            typeOf: 'Accounting',
+            accountsReceivable
+        } }, (appliesToMovieTicket !== undefined || appliesToMovieTicket4surfrock !== undefined)
         ? {
             appliesToMovieTicket: [
                 ...(appliesToMovieTicket !== undefined) ? [appliesToMovieTicket] : [],
@@ -120,10 +125,80 @@ function createPriceComponent(params) {
         default:
             unitPriceSpec.referenceQuantity.value = 1;
     }
+    // 区分加算料金
+    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
+        });
+    }
+    if (ticketInfo.spseatAdd1 > 0) {
+        categoryCodeChargeSpecs.push({
+            name: {
+                en: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                ja: '特別席加算額1'
+            },
+            price: ticketInfo.spseatAdd1,
+            priceCurrency: factory.priceCurrency.JPY,
+            typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+            appliesToCategoryCode: [],
+            valueAddedTaxIncluded: true
+        });
+    }
+    if (ticketInfo.spseatAdd2 > 0) {
+        categoryCodeChargeSpecs.push({
+            name: {
+                en: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                ja: '特別席加算額2'
+            },
+            price: ticketInfo.spseatAdd2,
+            priceCurrency: factory.priceCurrency.JPY,
+            typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+            appliesToCategoryCode: [],
+            valueAddedTaxIncluded: true
+        });
+    }
+    // アドオン単価仕様
+    let addOnUnitPriceSpec;
+    if (ticketInfo.addGlasses > 0) {
+        addOnUnitPriceSpec = {
+            typeOf: factory.priceSpecificationType.UnitPriceSpecification,
+            name: { ja: 'メガネ', en: 'Glasses' },
+            price: Number(ticketInfo.addGlasses),
+            priceCurrency: factory.priceCurrency.JPY,
+            referenceQuantity: {
+                typeOf: 'QuantitativeValue',
+                unitCode: factory.unitCode.C62,
+                value: 1
+            },
+            valueAddedTaxIncluded: true,
+            appliesToAddOn: [{
+                    typeOf: factory.offerType.Offer,
+                    // id?: string;
+                    // identifier?: string;
+                    itemOffered: {
+                        // id: '',
+                        // name :'',
+                        productID: '',
+                        typeOf: factory.product.ProductType.Product
+                    }
+                }]
+        };
+    }
     const priceComponent = [
         unitPriceSpec,
         ...(movieTicketTypeChargePriceSpec !== undefined) ? [movieTicketTypeChargePriceSpec] : [],
-        ...(surfrockChargePriceSpec !== undefined) ? [surfrockChargePriceSpec] : []
+        ...(surfrockChargePriceSpec !== undefined) ? [surfrockChargePriceSpec] : [],
+        ...categoryCodeChargeSpecs,
+        ...(addOnUnitPriceSpec !== undefined) ? [addOnUnitPriceSpec] : []
     ];
     return { priceComponent, eligibleMonetaryAmount };
 }

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

@@ -25,7 +25,9 @@ function findPlaceOrderTransaction(params) {
                     confirmationNumber: { $eq: params.confirmationNumber },
                     orderNumbers: [params.orderNumber]
                 }
-            }
+            },
+            inclusion: [],
+            exclusion: []
         });
         const placeOrderTransaction = placeOrderTransactions.shift();
         if (placeOrderTransaction === undefined) {

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

@@ -33,7 +33,9 @@ function returnOrder(params) {
             project: { id: { $eq: order.project.id } },
             typeOf: factory.transactionType.ReturnOrder,
             statuses: [factory.transactionStatusType.Confirmed],
-            object: { order: { orderNumbers: [orderNumber] } }
+            object: { order: { orderNumbers: [orderNumber] } },
+            inclusion: [],
+            exclusion: []
         });
         const returnOrderTransaction = returnOrderTransactions.shift();
         if (returnOrderTransaction === undefined) {

package/lib/chevre/service/report/telemetry.js

@@ -222,7 +222,9 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
             seller: { ids: [sellerId] },
             startFrom: measuredFrom,
             startThrough: measuredThrough,
-            endThrough: new Date()
+            endThrough: new Date(),
+            inclusion: [],
+            exclusion: []
         });
         const numberOfStartedAndConfirmed = startedAndEndedTransactions.filter((transaction) => transaction.status === factory.transactionStatusType.Confirmed).length;
         const numberOfStartedAndExpired = startedAndEndedTransactions.filter((transaction) => transaction.status === factory.transactionStatusType.Expired).length;
@@ -230,7 +232,9 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
             typeOf: factory.transactionType.PlaceOrder,
             seller: { ids: [sellerId] },
             endFrom: measuredFrom,
-            endThrough: measuredThrough
+            endThrough: measuredThrough,
+            inclusion: [],
+            exclusion: []
         });
         debug(endedTransactions.length, 'endedTransactions found.');
         const confirmedTransactions = endedTransactions.filter((transaction) => transaction.status === factory.transactionStatusType.Confirmed);

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

@@ -54,7 +54,9 @@ function returnPayTransaction(params) {
             limit: 1,
             page: 1,
             typeOf: factory.transactionType.ReturnOrder,
-            object: { order: { orderNumbers: [orderNumber] } }
+            object: { order: { orderNumbers: [orderNumber] } },
+            inclusion: [],
+            exclusion: []
         });
         const returnOrderTransaction = returnOrderTransactions.shift();
         if (returnOrderTransaction === undefined) {

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.8.0"
+  "version": "20.9.0-alpha.1"
 }

package/example/src/chevre/searchTasks.ts

@@ -1,22 +0,0 @@
-// 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);
-
-    const taskRepo = new chevre.repository.Task(mongoose.connection);
-
-    const tasks = await taskRepo.search({
-        limit: 100,
-        page: 1,
-        id: { $eq: '63b7a54d8ba861284895937f' }
-    });
-    console.log(tasks);
-    console.log(tasks.length);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);