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

package/example/src/chevre/searchOffers.ts

@@ -1,37 +1,37 @@
 // tslint:disable:no-console
-// import * as redis from 'redis';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
 
     const offers = await offerRepo.search({
-        // limit: 1,
+        limit: 1,
         // page: 1,
         project: { id: { $eq: String(process.env.PROJECT_ID) } },
-        additionalProperty: {
-            $all: [
-                {
-                    $elemMatch: {
-                        name: { $eq: 'theaterCode' },
-                        value: { $in: ['120'] }
-                    }
-                },
-                {
-                    $elemMatch: {
-                        name: { $eq: 'ticketCode' },
-                        value: { $in: ['10', '1001'] }
-                    }
-                }
-            ]
-        }
+        availability: { $eq: chevre.factory.itemAvailability.InStock }
+        // additionalProperty: {
+        //     $all: [
+        //         {
+        //             $elemMatch: {
+        //                 name: { $eq: 'theaterCode' },
+        //                 value: { $in: ['120'] }
+        //             }
+        //         },
+        //         {
+        //             $elemMatch: {
+        //                 name: { $eq: 'ticketCode' },
+        //                 value: { $in: ['10', '1001'] }
+        //             }
+        //         }
+        //     ]
+        // }
     });
     console.log(offers.map((offer) => {
-        return `${offer.additionalProperty?.find((p) => p.name === 'theaterCode')?.value} ${offer.additionalProperty?.find((p) => p.name === 'ticketCode')?.value}`;
+        return `${offer.project.id} ${offer.id} ${offer.identifier} ${offer.name.ja}`;
     }));
     console.log(offers.length);
 }

package/lib/chevre/repo/mongoose/schemas/offer.js

@@ -208,3 +208,4 @@ schema.index({ validThrough: 1, 'priceSpecification.price': 1 }, {
         validThrough: { $exists: true }
     }
 });
+schema.index({ availability: 1, 'priceSpecification.price': 1 }, { name: 'searchByAvailability' });

package/lib/chevre/repo/offer.js

@@ -36,7 +36,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_OFFER_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -266,7 +266,11 @@ class MongoRepository {
                 });
             }
         }
-        const availableAtOrFromIdEq = (_23 = (_22 = params.availableAtOrFrom) === null || _22 === void 0 ? void 0 : _22.id) === null || _23 === void 0 ? void 0 : _23.$eq;
+        const availabilityEq = (_22 = params.availability) === null || _22 === void 0 ? void 0 : _22.$eq;
+        if (typeof availabilityEq === 'string') {
+            andConditions.push({ availability: { $eq: availabilityEq } });
+        }
+        const availableAtOrFromIdEq = (_24 = (_23 = params.availableAtOrFrom) === null || _23 === void 0 ? void 0 : _23.id) === null || _24 === void 0 ? void 0 : _24.$eq;
         if (typeof availableAtOrFromIdEq === 'string') {
             andConditions.push({
                 'availableAtOrFrom.id': {
@@ -275,7 +279,7 @@ class MongoRepository {
                 }
             });
         }
-        const availableAtOrFromIdIn = (_25 = (_24 = params.availableAtOrFrom) === null || _24 === void 0 ? void 0 : _24.id) === null || _25 === void 0 ? void 0 : _25.$in;
+        const availableAtOrFromIdIn = (_26 = (_25 = params.availableAtOrFrom) === null || _25 === void 0 ? void 0 : _25.id) === null || _26 === void 0 ? void 0 : _26.$in;
         if (Array.isArray(availableAtOrFromIdIn)) {
             andConditions.push({
                 'availableAtOrFrom.id': {
@@ -284,7 +288,7 @@ class MongoRepository {
                 }
             });
         }
-        const addOnItemOfferedIdEq = (_28 = (_27 = (_26 = params.addOn) === null || _26 === void 0 ? void 0 : _26.itemOffered) === null || _27 === void 0 ? void 0 : _27.id) === null || _28 === void 0 ? void 0 : _28.$eq;
+        const addOnItemOfferedIdEq = (_29 = (_28 = (_27 = params.addOn) === null || _27 === void 0 ? void 0 : _27.itemOffered) === null || _28 === void 0 ? void 0 : _28.id) === null || _29 === void 0 ? void 0 : _29.$eq;
         if (typeof addOnItemOfferedIdEq === 'string') {
             andConditions.push({
                 'addOn.itemOffered.id': {
@@ -293,7 +297,7 @@ class MongoRepository {
                 }
             });
         }
-        const hasMerchantReturnPolicyIdEq = (_30 = (_29 = params.hasMerchantReturnPolicy) === null || _29 === void 0 ? void 0 : _29.id) === null || _30 === void 0 ? void 0 : _30.$eq;
+        const hasMerchantReturnPolicyIdEq = (_31 = (_30 = params.hasMerchantReturnPolicy) === null || _30 === void 0 ? void 0 : _30.id) === null || _31 === void 0 ? void 0 : _31.$eq;
         if (typeof hasMerchantReturnPolicyIdEq === 'string') {
             andConditions.push({
                 'hasMerchantReturnPolicy.id': {
@@ -302,7 +306,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyAll = (_31 = params.additionalProperty) === null || _31 === void 0 ? void 0 : _31.$all;
+        const additionalPropertyAll = (_32 = params.additionalProperty) === null || _32 === void 0 ? void 0 : _32.$all;
         if (Array.isArray(additionalPropertyAll)) {
             andConditions.push({
                 additionalProperty: {
@@ -311,7 +315,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_32 = params.additionalProperty) === null || _32 === void 0 ? void 0 : _32.$elemMatch;
+        const additionalPropertyElemMatch = (_33 = params.additionalProperty) === null || _33 === void 0 ? void 0 : _33.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {

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

@@ -25,7 +25,7 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 export type IProduct = factory.product.IProduct | factory.service.paymentService.IService;
-export type IPaymentServiceByProvider = Pick<factory.service.paymentService.IService, 'name' | 'description' | 'typeOf' | 'id' | 'productID' | 'serviceType' | 'additionalProperty'> & {
+export type IPaymentServiceByProvider = Pick<factory.service.paymentService.IService, 'name' | 'description' | 'typeOf' | 'id' | 'productID' | 'serviceType' | 'serviceOutput' | 'additionalProperty'> & {
     provider?: Pick<factory.service.paymentService.IProvider, 'credentials'>;
 };
 /**

package/lib/chevre/repo/product.js

@@ -286,6 +286,7 @@ class MongoRepository {
                         name: '$name',
                         // provider: [ [Object] ],
                         additionalProperty: '$additionalProperty',
+                        serviceOutput: '$serviceOutput',
                         serviceType: '$serviceType',
                         id: { $toString: '$_id' },
                         // ↓セキュアな情報を隠蔽するように

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.325.0-alpha.0",
+    "@chevre/factory": "^4.325.0-alpha.1",
     "@cinerino/sdk": "3.163.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.7.0-alpha.0"
+  "version": "21.7.0-alpha.2"
 }