npm - @chevre/domain - Versions diffs - 21.6.0-alpha.8 → 21.6.0 - Mend

@chevre/domain 21.6.0-alpha.8 → 21.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/example/src/chevre/migrateMovieAvailabilityStarts.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 // tslint:disable:no-console
-import * as moment from 'moment';
+import * as moment from 'moment-timezone';
 import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
@@ -15,7 +15,7 @@ async function main() {
     const cursor = creativeWorkRepo.getCursor(
         {
-            'offers.availabilityEnds': { $exists: true }
+            // 'offers.availabilityEnds': { $exists: true }
         },
         {}
     );
@@ -23,7 +23,8 @@ async function main() {
     let i = 0;
     let updateCount = 0;
-    let datePublishedUndefinedCount = 0;
+    // let datePublishedUndefinedCount = 0;
+    // let datePublishedIsAfterNowCount = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
         const movie: chevre.factory.creativeWork.movie.ICreativeWork = doc.toObject();
@@ -34,22 +35,32 @@ async function main() {
         if (!(createdAt instanceof Date)) {
             throw new Error('createdAt not Date');
         }
-        const alreadyMigrated = availabilityStarts instanceof Date;
+        const alreadyMigrated = availabilityStarts instanceof Date
+            && moment(availabilityStarts)
+                .isSame(moment(createdAt)
+                    .tz('Asia/Tokyo')
+                    .startOf('day')
+                );
         if (alreadyMigrated) {
-            console.log('already exist...', movie.project.id, movie.id, movie.identifier, availabilityStarts, availabilityEnds, i);
+            console.log(
+                'already exist...', movie.project.id, movie.id, movie.identifier, availabilityStarts, availabilityEnds, createdAt, i);
+            // if (moment(movie.datePublished)
+            //     .isAfter(moment())) {
+            //     datePublishedIsAfterNowCount += 1;
+            // }
         } else {
-            if (movie.datePublished === undefined) {
-                console.error('movie.datePublished undefined', movie.project.id, movie.id, movie.identifier, i);
-                // throw new Error('movie.datePublished undefined');
-                datePublishedUndefinedCount += 1;
-            }
+            // if (movie.datePublished === undefined) {
+            //     console.error('movie.datePublished undefined', movie.project.id, movie.id, movie.identifier, i);
+            //     // throw new Error('movie.datePublished undefined');
+            //     datePublishedUndefinedCount += 1;
+            // }
-            availabilityStarts = (movie.datePublished !== undefined)
-                ? moment(movie.datePublished)
-                    .toDate()
-                : moment(createdAt)
-                    .toDate();
+            availabilityStarts = moment(createdAt)
+                .tz('Asia/Tokyo')
+                .startOf('day')
+                .toDate();
             console.log('updating movie...', movie.project.id, movie.id, movie.identifier, availabilityStarts, availabilityEnds, i);
             await creativeWorkRepo.saveMovie(<any>{
                 id: String(movie.id),
@@ -62,7 +73,9 @@ async function main() {
     console.log(i, 'creativeWorks checked');
     console.log(updateCount, 'creativeWorks updated');
-    console.log(datePublishedUndefinedCount, 'datePublishedUndefinedCount');
+    // console.log(datePublishedUndefinedCount, 'datePublishedUndefinedCount');
+    // console.log(datePublishedIsAfterNowCount, 'datePublishedIsAfterNowCount');
 }
 main()

package/example/src/chevre/searchSellers.ts ADDED Viewed

@@ -0,0 +1,28 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import { chevre } from '../../../lib/index';
+const project = { id: String(process.env.PROJECT_ID) };
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    const sellerRepo = new chevre.repository.Seller(mongoose.connection);
+    const sellers = await sellerRepo.search(
+        {
+            project: { id: { $eq: project.id } },
+            paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
+            hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
+        },
+        ['name'],
+        []
+    );
+    console.log('sellers found', sellers);
+    console.log(sellers.length, 'sellers found');
+}
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/mongoose/schemas/creativeWork.d.ts CHANGED Viewed

@@ -55,18 +55,15 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     typeOf: string;
     name?: any;
     project?: any;
-    alternateName?: string | undefined;
     description?: string | undefined;
     additionalProperty?: any;
     identifier?: string | undefined;
     duration?: string | undefined;
     alternativeHeadline?: string | undefined;
-    copyrightHolder?: any;
     copyrightYear?: number | undefined;
     datePublished?: Date | undefined;
     distributor?: any;
     headline?: string | undefined;
-    license?: string | undefined;
     thumbnailUrl?: string | undefined;
     contentRating?: string | undefined;
     offers?: any;
@@ -74,18 +71,15 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     typeOf: string;
     name?: any;
     project?: any;
-    alternateName?: string | undefined;
     description?: string | undefined;
     additionalProperty?: any;
     identifier?: string | undefined;
     duration?: string | undefined;
     alternativeHeadline?: string | undefined;
-    copyrightHolder?: any;
     copyrightYear?: number | undefined;
     datePublished?: Date | undefined;
     distributor?: any;
     headline?: string | undefined;
-    license?: string | undefined;
     thumbnailUrl?: string | undefined;
     contentRating?: string | undefined;
     offers?: any;
@@ -93,18 +87,15 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     typeOf: string;
     name?: any;
     project?: any;
-    alternateName?: string | undefined;
     description?: string | undefined;
     additionalProperty?: any;
     identifier?: string | undefined;
     duration?: string | undefined;
     alternativeHeadline?: string | undefined;
-    copyrightHolder?: any;
     copyrightYear?: number | undefined;
     datePublished?: Date | undefined;
     distributor?: any;
     headline?: string | undefined;
-    license?: string | undefined;
     thumbnailUrl?: string | undefined;
     contentRating?: string | undefined;
     offers?: any;

package/lib/chevre/repo/mongoose/schemas/creativeWork.js CHANGED Viewed

@@ -16,15 +16,15 @@ const schema = new mongoose_1.Schema({
     },
     identifier: String,
     name: mongoose_1.SchemaTypes.Mixed,
-    alternateName: String,
+    // alternateName: String,
     alternativeHeadline: String,
     description: String,
-    copyrightHolder: mongoose_1.SchemaTypes.Mixed,
+    // copyrightHolder: SchemaTypes.Mixed,
     copyrightYear: Number,
     datePublished: Date,
     distributor: mongoose_1.SchemaTypes.Mixed,
     headline: String,
-    license: String,
+    // license: String,
     thumbnailUrl: String,
     duration: String,
     contentRating: String,

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

@@ -75,6 +75,18 @@ schema.index({ additionalProperty: 1, branchCode: 1 }, {
         additionalProperty: { $exists: true }
     }
 });
+schema.index({ 'paymentAccepted.paymentMethodType': 1, branchCode: 1 }, {
+    name: 'searchByPaymentAccepted',
+    partialFilterExpression: {
+        'paymentAccepted.paymentMethodType': { $exists: true }
+    }
+});
+schema.index({ 'hasMerchantReturnPolicy.applicablePaymentMethod': 1, branchCode: 1 }, {
+    name: 'searchByHasMerchantReturnPolicyApplicablePaymentMethod',
+    partialFilterExpression: {
+        'hasMerchantReturnPolicy.applicablePaymentMethod': { $exists: true }
+    }
+});
 schema.index({ 'hasMerchantReturnPolicy.itemCondition.id': 1, branchCode: 1 }, {
     name: 'searchByHasMerchantReturnPolicyItemConditionId',
     partialFilterExpression: {

package/lib/chevre/repo/seller.js CHANGED Viewed

@@ -34,7 +34,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         // 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;
@@ -120,7 +120,19 @@ class MongoRepository {
                 }
             });
         }
-        const hasMerchantReturnPolicyItemConditionIdEq = (_q = (_p = (_o = params.hasMerchantReturnPolicy) === null || _o === void 0 ? void 0 : _o.itemCondition) === null || _p === void 0 ? void 0 : _p.id) === null || _q === void 0 ? void 0 : _q.$eq;
+        const paymentAcceptedEq = (_p = (_o = params.paymentAccepted) === null || _o === void 0 ? void 0 : _o.paymentMethodType) === null || _p === void 0 ? void 0 : _p.$eq;
+        if (typeof paymentAcceptedEq === 'string') {
+            andConditions.push({
+                'paymentAccepted.paymentMethodType': { $exists: true, $eq: paymentAcceptedEq }
+            });
+        }
+        const hasMerchantReturnApplicablePaymentMethodEq = (_r = (_q = params.hasMerchantReturnPolicy) === null || _q === void 0 ? void 0 : _q.applicablePaymentMethod) === null || _r === void 0 ? void 0 : _r.$eq;
+        if (typeof hasMerchantReturnApplicablePaymentMethodEq === 'string') {
+            andConditions.push({
+                'hasMerchantReturnPolicy.applicablePaymentMethod': { $exists: true, $eq: hasMerchantReturnApplicablePaymentMethodEq }
+            });
+        }
+        const hasMerchantReturnPolicyItemConditionIdEq = (_u = (_t = (_s = params.hasMerchantReturnPolicy) === null || _s === void 0 ? void 0 : _s.itemCondition) === null || _t === void 0 ? void 0 : _t.id) === null || _u === void 0 ? void 0 : _u.$eq;
         if (typeof hasMerchantReturnPolicyItemConditionIdEq === 'string') {
             andConditions.push({
                 'hasMerchantReturnPolicy.itemCondition.id': {

package/lib/chevre/service/assetTransaction/refund/factory.js CHANGED Viewed

@@ -6,7 +6,7 @@ exports.createStartParams = void 0;
  */
 const factory = require("../../../factory");
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
     if (typeof paymentMethodType !== 'string') {
         throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
@@ -19,6 +19,17 @@ function createStartParams(params) {
     const name = (_d = params.object.paymentMethod) === null || _d === void 0 ? void 0 : _d.name;
     const informPaymentParams = createInformPaymentParams({ paymentService: params.paymentService });
     const accountId = (_f = (_e = params.payAction.object[0]) === null || _e === void 0 ? void 0 : _e.paymentMethod) === null || _f === void 0 ? void 0 : _f.accountId;
+    // 手数料は、CreditCardIFかつカード通貨区分が存在しない場合のみ設定すればよい
+    let refundFee;
+    if (((_g = params.paymentService) === null || _g === void 0 ? void 0 : _g.typeOf) === factory.service.paymentService.PaymentServiceType.CreditCard) {
+        // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
+        const paymentServiceOutputAmountCurrency = (_j = (_h = params.paymentService.serviceOutput) === null || _h === void 0 ? void 0 : _h.amount) === null || _j === void 0 ? void 0 : _j.currency;
+        if (typeof paymentServiceOutputAmountCurrency !== 'string') {
+            if (typeof params.object.refundFee === 'number') {
+                refundFee = params.object.refundFee;
+            }
+        }
+    }
     return {
         project: { typeOf: factory.organizationType.Project, id: params.project.id },
         transactionNumber: params.transactionNumber,
@@ -29,9 +40,7 @@ function createStartParams(params) {
                 ? params.payAction.object[0].id
                 : '', onPaymentStatusChanged: { informPayment: informPaymentParams }, paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: (typeof name === 'string') ? name : paymentMethodType, paymentMethodId: paymentMethodId, typeOf: paymentMethodType }, (Array.isArray(params.payAction.object) && params.payAction.object.length > 0)
                 ? { totalPaymentDue: params.payAction.object[0].paymentMethod.totalPaymentDue }
-                : undefined) }, (typeof params.object.refundFee === 'number')
-            ? { refundFee: params.object.refundFee }
-            : undefined),
+                : undefined) }, (typeof refundFee === 'number') ? { refundFee } : undefined),
         expires: params.expires
     };
 }

package/lib/chevre/service/transaction/placeOrderInProgress/validation.js CHANGED Viewed

@@ -211,11 +211,15 @@ function validateNumItems(params) {
 }
 exports.validateNumItems = validateNumItems;
 function validatePaymentMethods(params) {
-    debug('processing validatePaymentMethods...maxNumCreditCardPaymentMethod:', settings_1.settings.maxNumCreditCardPaymentMethod);
     if (typeof settings_1.settings.maxNumCreditCardPaymentMethod === 'number') {
         // CreditCard IFの決済方法の最大値検証
-        const creditCardPaymentMethodCount = params.order.paymentMethods.filter((p) => p.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard).length;
-        debug('processing validatePaymentMethods...creditCardPaymentMethodCount:', creditCardPaymentMethodCount);
+        const creditCardPaymentMethodCount = params.order.paymentMethods.filter((p) => {
+            var _a, _b;
+            // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
+            const serviceOutputAmountCurrency = (_b = (_a = p.issuedThrough.serviceOutput) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
+            return p.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
+                && typeof serviceOutputAmountCurrency !== 'string';
+        }).length;
         if (creditCardPaymentMethodCount > settings_1.settings.maxNumCreditCardPaymentMethod) {
             throw new factory.errors.Argument('Transaction', (0, util_1.format)(`Number of paymentMethods issued through ${factory.service.paymentService.PaymentServiceType.CreditCard} payment service must be less than equal to %s`, settings_1.settings.maxNumCreditCardPaymentMethod));
         }

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

@@ -155,8 +155,8 @@ function fixOrders(params) {
             // 不要な属性は参照しない
             acceptedOffers: 0,
             customer: 0,
-            orderedItem: 0,
-            paymentMethods: 0
+            orderedItem: 0
+            // paymentMethods: 0 // 適用決済方法検証に必要
         });
         if (orders.length !== params.object.order.length) {
             throw new factory.errors.NotFound('Order');
@@ -268,104 +268,20 @@ function findApplicableReturnPolicy(params) {
         };
     }
     const returnPolicies = params.returnPolicies;
-    const returningDate = moment(params.returningDate);
+    // const returningDate = moment(params.returningDate);
     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, _k;
-            let satisfyMerchantReturnDays = false;
-            let offerItemCondition;
-            const itemConditionId = (_a = returnPolicy.itemCondition) === null || _a === void 0 ? void 0 : _a.id;
-            if (typeof itemConditionId === 'string') {
-                offerItemCondition = params.offerItemConditions.find((o) => o.id === itemConditionId);
-                if (offerItemCondition === undefined) {
-                    throw new factory.errors.NotFound('OfferItemCondition');
-                }
-            }
-            const merchantReturnDays = returnPolicy.merchantReturnDays;
-            if (typeof merchantReturnDays === 'number') {
-                // 返品適用日数を確認する
-                const everyOrderApplicable = params.orders.every((order) => {
-                    const mustBeReturnedUntil = moment(order.orderDate)
-                        .add(merchantReturnDays, 'days');
-                    return mustBeReturnedUntil.isSameOrAfter(returningDate);
-                });
-                // 全注文について日数の確認ができれば適用
-                if (everyOrderApplicable) {
-                    satisfyMerchantReturnDays = true;
-                }
-            }
-            else {
-                // 日数制限なし
-                satisfyMerchantReturnDays = true;
-            }
-            // イベント開始猶予を検証する(2023-05-22~)
-            let satisfyItemCondition = true;
-            if (offerItemCondition !== undefined) {
-                let satisfyGracePeriodMaxValue = true;
-                let satisfyGracePeriodMinValue = true;
-                // 全イベントについて猶予の確認ができれば適用
-                const gracePeriodMaxValue = (_c = (_b = offerItemCondition.itemOffered.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservationFor.gracePeriodBeforeStart) === null || _c === void 0 ? void 0 : _c.maxValue;
-                const gracePeriodMinValue = (_e = (_d = offerItemCondition.itemOffered.serviceOutput) === null || _d === void 0 ? void 0 : _d.reservationFor.gracePeriodBeforeStart) === null || _e === void 0 ? void 0 : _e.minValue;
-                if (typeof gracePeriodMaxValue === 'number') {
-                    satisfyGracePeriodMaxValue = params.events.every((event) => {
-                        return moment(event.startDate)
-                            .isSameOrBefore(moment(params.returningDate)
-                            .add(gracePeriodMaxValue, 'seconds'));
-                    });
-                }
-                if (typeof gracePeriodMinValue === 'number') {
-                    satisfyGracePeriodMinValue = params.events.every((event) => {
-                        return moment(event.startDate)
-                            .isAfter(moment(params.returningDate)
-                            .add(gracePeriodMinValue, 'seconds'));
-                    });
-                }
-                let satisfyGracePeriodInDaysMax = true;
-                let satisfyGracePeriodInDaysMin = true;
-                const gracePeriodBeforeStartInDaysMax = (_g = (_f = offerItemCondition.itemOffered.serviceOutput) === null || _f === void 0 ? void 0 : _f.reservationFor.gracePeriodBeforeStartInDays) === null || _g === void 0 ? void 0 : _g.max;
-                if (typeof (gracePeriodBeforeStartInDaysMax === null || gracePeriodBeforeStartInDaysMax === void 0 ? void 0 : gracePeriodBeforeStartInDaysMax.period.value) === 'number'
-                    && typeof gracePeriodBeforeStartInDaysMax.time === 'string') {
-                    satisfyGracePeriodInDaysMax = params.events.every((event) => {
-                        const maxDate = moment(event.startDate)
-                            .tz(gracePeriodBeforeStartInDaysMax.timezone)
-                            .startOf('days')
-                            .subtract(gracePeriodBeforeStartInDaysMax.period.value, 'days')
-                            .format('YYYY-MM-DD');
-                        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') {
-                    satisfyGracePeriodInDaysMin = params.events.every((event) => {
-                        const minDate = moment(event.startDate)
-                            .tz(gracePeriodBeforeStartInDaysMin.timezone)
-                            .startOf('days')
-                            .subtract(gracePeriodBeforeStartInDaysMin.period.value, 'days')
-                            .format('YYYY-MM-DD');
-                        const returnMaxDate = moment.tz(`${minDate}T${gracePeriodBeforeStartInDaysMin.time}`, gracePeriodBeforeStartInDaysMin.timezone);
-                        debug('returnMaxDate:', returnMaxDate, 'returningDate:', returningDate);
-                        return returnMaxDate.isAfter(moment(returningDate));
-                    });
-                }
-                debug('satisfyGracePeriodInDaysMin:', satisfyGracePeriodInDaysMin);
-                let satisfyOnlyUnused = true;
-                if (((_k = offerItemCondition.itemOffered.serviceOutput) === null || _k === void 0 ? void 0 : _k.onlyUnused) === true) {
-                    if (params.usedReservationExists) {
-                        satisfyOnlyUnused = false;
-                    }
-                }
-                debug('usedReservationExists:', params.usedReservationExists, 'satisfyOnlyUnused:', satisfyOnlyUnused);
-                satisfyItemCondition = satisfyGracePeriodMaxValue && satisfyGracePeriodMinValue
-                    && satisfyGracePeriodInDaysMax && satisfyGracePeriodInDaysMin && satisfyOnlyUnused;
-            }
-            return satisfyMerchantReturnDays && satisfyItemCondition;
+            return isSellerReturnPolicyApplicable({
+                returnPolicy,
+                events: params.events,
+                offerItemConditions: params.offerItemConditions,
+                orders: params.orders,
+                returningDate: params.returningDate,
+                usedReservationExists: params.usedReservationExists
+            });
         });
     }
     // 販売者にポリシーが存在しなければ返品不可
@@ -403,6 +319,119 @@ function findApplicableReturnPolicy(params) {
     return Object.assign({ merchantReturnDays: appliedReturnPolicy.merchantReturnDays, restockingFee: appliedReturnPolicy.restockingFee, returnFees,
         returnFeesMovieTicket, typeOf: appliedReturnPolicy.typeOf }, (typeof (appliedItemCondition === null || appliedItemCondition === void 0 ? void 0 : appliedItemCondition.typeOf) === 'string') ? { itemCondition: appliedItemCondition } : undefined);
 }
+// tslint:disable-next-line:cyclomatic-complexity max-func-body-length
+function isSellerReturnPolicyApplicable(params) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    const returnPolicy = params.returnPolicy;
+    const returningDate = moment(params.returningDate);
+    let satisfyMerchantReturnDays = false;
+    let satisfyApplicablePaymentMethod = false;
+    let offerItemCondition;
+    const itemConditionId = (_a = returnPolicy.itemCondition) === null || _a === void 0 ? void 0 : _a.id;
+    if (typeof itemConditionId === 'string') {
+        offerItemCondition = params.offerItemConditions.find((o) => o.id === itemConditionId);
+        if (offerItemCondition === undefined) {
+            throw new factory.errors.NotFound('OfferItemCondition');
+        }
+    }
+    const merchantReturnDays = returnPolicy.merchantReturnDays;
+    if (typeof merchantReturnDays === 'number') {
+        // 返品適用日数を確認する
+        const everyOrderApplicable = params.orders.every((order) => {
+            const mustBeReturnedUntil = moment(order.orderDate)
+                .add(merchantReturnDays, 'days');
+            return mustBeReturnedUntil.isSameOrAfter(returningDate);
+        });
+        // 全注文について日数の確認ができれば適用
+        if (everyOrderApplicable) {
+            satisfyMerchantReturnDays = true;
+        }
+    }
+    else {
+        // 日数制限なし
+        satisfyMerchantReturnDays = true;
+    }
+    // 適用決済方法検証(2023-08-08~)
+    const applicablePaymentMethod = returnPolicy.applicablePaymentMethod;
+    if (Array.isArray(applicablePaymentMethod)) {
+        const everyOrderApplicable = params.orders.every((order) => {
+            // 全決済方法区分がapplicablePaymentMethodに含まれれば適用
+            return order.paymentMethods.every((paymentMethod) => applicablePaymentMethod.includes(paymentMethod.typeOf));
+        });
+        // 全注文について確認ができれば適用
+        if (everyOrderApplicable) {
+            satisfyApplicablePaymentMethod = true;
+        }
+    }
+    else {
+        satisfyApplicablePaymentMethod = true;
+    }
+    // イベント開始猶予を検証する(2023-05-22~)
+    let satisfyItemCondition = true;
+    if (offerItemCondition !== undefined) {
+        let satisfyGracePeriodMaxValue = true;
+        let satisfyGracePeriodMinValue = true;
+        // 全イベントについて猶予の確認ができれば適用
+        const gracePeriodMaxValue = (_c = (_b = offerItemCondition.itemOffered.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservationFor.gracePeriodBeforeStart) === null || _c === void 0 ? void 0 : _c.maxValue;
+        const gracePeriodMinValue = (_e = (_d = offerItemCondition.itemOffered.serviceOutput) === null || _d === void 0 ? void 0 : _d.reservationFor.gracePeriodBeforeStart) === null || _e === void 0 ? void 0 : _e.minValue;
+        if (typeof gracePeriodMaxValue === 'number') {
+            satisfyGracePeriodMaxValue = params.events.every((event) => {
+                return moment(event.startDate)
+                    .isSameOrBefore(moment(params.returningDate)
+                    .add(gracePeriodMaxValue, 'seconds'));
+            });
+        }
+        if (typeof gracePeriodMinValue === 'number') {
+            satisfyGracePeriodMinValue = params.events.every((event) => {
+                return moment(event.startDate)
+                    .isAfter(moment(params.returningDate)
+                    .add(gracePeriodMinValue, 'seconds'));
+            });
+        }
+        let satisfyGracePeriodInDaysMax = true;
+        let satisfyGracePeriodInDaysMin = true;
+        const gracePeriodBeforeStartInDaysMax = (_g = (_f = offerItemCondition.itemOffered.serviceOutput) === null || _f === void 0 ? void 0 : _f.reservationFor.gracePeriodBeforeStartInDays) === null || _g === void 0 ? void 0 : _g.max;
+        if (typeof (gracePeriodBeforeStartInDaysMax === null || gracePeriodBeforeStartInDaysMax === void 0 ? void 0 : gracePeriodBeforeStartInDaysMax.period.value) === 'number'
+            && typeof gracePeriodBeforeStartInDaysMax.time === 'string') {
+            satisfyGracePeriodInDaysMax = params.events.every((event) => {
+                const maxDate = moment(event.startDate)
+                    .tz(gracePeriodBeforeStartInDaysMax.timezone)
+                    .startOf('days')
+                    .subtract(gracePeriodBeforeStartInDaysMax.period.value, 'days')
+                    .format('YYYY-MM-DD');
+                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') {
+            satisfyGracePeriodInDaysMin = params.events.every((event) => {
+                const minDate = moment(event.startDate)
+                    .tz(gracePeriodBeforeStartInDaysMin.timezone)
+                    .startOf('days')
+                    .subtract(gracePeriodBeforeStartInDaysMin.period.value, 'days')
+                    .format('YYYY-MM-DD');
+                const returnMaxDate = moment.tz(`${minDate}T${gracePeriodBeforeStartInDaysMin.time}`, gracePeriodBeforeStartInDaysMin.timezone);
+                debug('returnMaxDate:', returnMaxDate, 'returningDate:', returningDate);
+                return returnMaxDate.isAfter(moment(returningDate));
+            });
+        }
+        debug('satisfyGracePeriodInDaysMin:', satisfyGracePeriodInDaysMin);
+        let satisfyOnlyUnused = true;
+        if (((_k = offerItemCondition.itemOffered.serviceOutput) === null || _k === void 0 ? void 0 : _k.onlyUnused) === true) {
+            if (params.usedReservationExists) {
+                satisfyOnlyUnused = false;
+            }
+        }
+        debug('usedReservationExists:', params.usedReservationExists, 'satisfyOnlyUnused:', satisfyOnlyUnused);
+        satisfyItemCondition = satisfyGracePeriodMaxValue && satisfyGracePeriodMinValue
+            && satisfyGracePeriodInDaysMax && satisfyGracePeriodInDaysMin && satisfyOnlyUnused;
+    }
+    return satisfyMerchantReturnDays && satisfyApplicablePaymentMethod && satisfyItemCondition;
+}
 /**
  * 注文中のオファーの返品ポリシーを検証
  */

package/package.json CHANGED Viewed

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.324.0-alpha.4",
-    "@cinerino/sdk": "3.162.3",
+    "@chevre/factory": "4.324.0",
+    "@cinerino/sdk": "3.163.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.6.0-alpha.8"
+  "version": "21.6.0"
 }