@chevre/domain 21.2.0-alpha.66 → 21.2.0-alpha.68

package/example/src/chevre/searchSellers.ts

@@ -0,0 +1,22 @@
+// tslint:disable:no-implicit-dependencies no-console
+import { chevre } from '../../../lib/index';
+
+import * as  mongoose from 'mongoose';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const sellerRepo = new chevre.repository.Seller(mongoose.connection);
+    const sellers = await sellerRepo.search({
+        hasMerchantReturnPolicy: { itemCondition: { id: { $eq: '646dc7848b3c1437d43dbfeb' } } }
+    });
+    console.log('sellers:', sellers);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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

@@ -75,3 +75,9 @@ schema.index({ additionalProperty: 1, branchCode: 1 }, {
         additionalProperty: { $exists: true }
     }
 });
+schema.index({ 'hasMerchantReturnPolicy.itemCondition.id': 1, branchCode: 1 }, {
+    name: 'searchByHasMerchantReturnPolicyItemConditionId',
+    partialFilterExpression: {
+        'hasMerchantReturnPolicy.itemCondition.id': { $exists: true }
+    }
+});

package/lib/chevre/repo/seller.js

@@ -32,21 +32,12 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         // MongoDB検索条件
         const andConditions = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.project !== undefined) {
-            if (params.project.id !== undefined && params.project.id !== null) {
-                if (typeof params.project.id.$eq === 'string') {
-                    andConditions.push({
-                        'project.id': {
-                            $eq: params.project.id.$eq
-                        }
-                    });
-                }
-            }
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
         const nameRegex = params.name;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
@@ -67,7 +58,7 @@ class MongoRepository {
                 ]
             });
         }
-        const branchCodeEq = (_a = params.branchCode) === null || _a === void 0 ? void 0 : _a.$eq;
+        const branchCodeEq = (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof branchCodeEq === 'string') {
             andConditions.push({
                 branchCode: {
@@ -75,7 +66,7 @@ class MongoRepository {
                 }
             });
         }
-        const branchCodeRegex = (_b = params.branchCode) === null || _b === void 0 ? void 0 : _b.$regex;
+        const branchCodeRegex = (_d = params.branchCode) === null || _d === void 0 ? void 0 : _d.$regex;
         if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
             andConditions.push({
                 branchCode: {
@@ -83,7 +74,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyAll = (_c = params.additionalProperty) === null || _c === void 0 ? void 0 : _c.$all;
+        const additionalPropertyAll = (_e = params.additionalProperty) === null || _e === void 0 ? void 0 : _e.$all;
         if (Array.isArray(additionalPropertyAll)) {
             andConditions.push({
                 additionalProperty: {
@@ -92,7 +83,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyIn = (_d = params.additionalProperty) === null || _d === void 0 ? void 0 : _d.$in;
+        const additionalPropertyIn = (_f = params.additionalProperty) === null || _f === void 0 ? void 0 : _f.$in;
         if (Array.isArray(additionalPropertyIn)) {
             andConditions.push({
                 additionalProperty: {
@@ -101,7 +92,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyNin = (_e = params.additionalProperty) === null || _e === void 0 ? void 0 : _e.$nin;
+        const additionalPropertyNin = (_g = params.additionalProperty) === null || _g === void 0 ? void 0 : _g.$nin;
         if (Array.isArray(additionalPropertyNin)) {
             andConditions.push({
                 additionalProperty: {
@@ -109,7 +100,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_f = params.additionalProperty) === null || _f === void 0 ? void 0 : _f.$elemMatch;
+        const additionalPropertyElemMatch = (_h = params.additionalProperty) === null || _h === void 0 ? void 0 : _h.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -118,6 +109,15 @@ class MongoRepository {
                 }
             });
         }
+        const hasMerchantReturnPolicyItemConditionIdEq = (_l = (_k = (_j = params.hasMerchantReturnPolicy) === null || _j === void 0 ? void 0 : _j.itemCondition) === null || _k === void 0 ? void 0 : _k.id) === null || _l === void 0 ? void 0 : _l.$eq;
+        if (typeof hasMerchantReturnPolicyItemConditionIdEq === 'string') {
+            andConditions.push({
+                'hasMerchantReturnPolicy.itemCondition.id': {
+                    $exists: true,
+                    $eq: hasMerchantReturnPolicyItemConditionIdEq
+                }
+            });
+        }
         return andConditions;
     }
     /**

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

@@ -237,6 +237,7 @@ function findApplicableReturnPolicy(params) {
     let applicalbleReturnPolicies = [];
     if (params.reason === factory.transaction.returnOrder.Reason.Customer) {
         // 適用可能なポリシーにフィルター
+        // tslint:disable-next-line:max-func-body-length
         applicalbleReturnPolicies = returnPolicies.filter((returnPolicy) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             let satisfyMerchantReturnDays = false;
@@ -285,7 +286,7 @@ function findApplicableReturnPolicy(params) {
                 if (typeof gracePeriodMinValue === 'number') {
                     satisfyGracePeriodMinValue = params.events.every((event) => {
                         return moment(event.startDate)
-                            .isSameOrAfter(moment(params.returningDate)
+                            .isAfter(moment(params.returningDate)
                             .add(gracePeriodMinValue, 'seconds'));
                     });
                 }
@@ -293,16 +294,17 @@ function findApplicableReturnPolicy(params) {
                 if (typeof (gracePeriodBeforeStartInDaysMax === null || gracePeriodBeforeStartInDaysMax === void 0 ? void 0 : gracePeriodBeforeStartInDaysMax.period.value) === 'number'
                     && typeof gracePeriodBeforeStartInDaysMax.time === 'string') {
                     satisfyGracePeriodInDaysMax = params.events.every((event) => {
-                        const minDate = moment(event.startDate)
+                        const maxDate = moment(event.startDate)
                             .tz(gracePeriodBeforeStartInDaysMax.timezone)
                             .startOf('days')
                             .subtract(gracePeriodBeforeStartInDaysMax.period.value, 'days')
                             .format('YYYY-MM-DD');
-                        const returnMinDate = moment(`${minDate}T${gracePeriodBeforeStartInDaysMax.time}`)
-                            .tz(gracePeriodBeforeStartInDaysMax.timezone);
+                        const returnMinDate = moment.tz(`${maxDate}T${gracePeriodBeforeStartInDaysMax.time}`, gracePeriodBeforeStartInDaysMax.timezone);
+                        debug('returnMinDate:', returnMinDate, 'returningDate:', returningDate);
                         return returnMinDate.isSameOrBefore(moment(returningDate));
                     });
                 }
+                debug('gracePeriodBeforeStartInDaysMax:', gracePeriodBeforeStartInDaysMax);
                 const gracePeriodBeforeStartInDaysMin = (_j = (_h = offerItemCondition.itemOffered.serviceOutput) === null || _h === void 0 ? void 0 : _h.reservationFor.gracePeriodBeforeStartInDays) === null || _j === void 0 ? void 0 : _j.min;
                 if (typeof (gracePeriodBeforeStartInDaysMin === null || gracePeriodBeforeStartInDaysMin === void 0 ? void 0 : gracePeriodBeforeStartInDaysMin.period.value) === 'number'
                     && typeof gracePeriodBeforeStartInDaysMin.time === 'string') {
@@ -314,7 +316,7 @@ function findApplicableReturnPolicy(params) {
                             .format('YYYY-MM-DD');
                         const returnMaxDate = moment.tz(`${minDate}T${gracePeriodBeforeStartInDaysMin.time}`, gracePeriodBeforeStartInDaysMin.timezone);
                         debug('returnMaxDate:', returnMaxDate, 'returningDate:', returningDate);
-                        return returnMaxDate.isSameOrAfter(moment(returningDate));
+                        return returnMaxDate.isAfter(moment(returningDate));
                     });
                 }
                 debug('satisfyGracePeriodInDaysMin:', satisfyGracePeriodInDaysMin);

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.8",
-    "@cinerino/sdk": "3.156.0",
+    "@chevre/factory": "4.313.0-alpha.10",
+    "@cinerino/sdk": "3.157.0-alpha.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.2.0-alpha.66"
+  "version": "21.2.0-alpha.68"
 }