@chevre/domain 22.8.0-alpha.17 → 22.8.0-alpha.19

package/example/src/chevre/migrateSellerReturnPolicies.ts

@@ -37,17 +37,19 @@ async function main() {
             alreadyMigrated = true;
         } else {
             for (const policy of hasMerchantReturnPolicy) {
-                const existingPolicy = (await sellerReturnPolicyRepo.projectFields(
-                    {
-                        limit: 1,
-                        page: 1,
-                        project: { id: { $eq: seller.project.id } },
-                        restockingFee: { value: { $eq: policy.restockingFee.value } }
-                    },
-                    ['identifier']
-                )).shift();
-                if (existingPolicy === undefined) {
-                    alreadyMigrated = false;
+                if (policy.restockingFee !== undefined) {
+                    const existingPolicy = (await sellerReturnPolicyRepo.projectFields(
+                        {
+                            limit: 1,
+                            page: 1,
+                            project: { id: { $eq: seller.project.id } },
+                            restockingFee: { value: { $eq: policy.restockingFee.value } }
+                        },
+                        ['identifier']
+                    )).shift();
+                    if (existingPolicy === undefined) {
+                        alreadyMigrated = false;
+                    }
                 }
             }
         }
@@ -57,26 +59,31 @@ async function main() {
                 'already migrated.', seller.id, seller.project.id, i);
         } else {
             if (Array.isArray(hasMerchantReturnPolicy)) {
-                const newPolicies: ISavingReturnPolicy[] = hasMerchantReturnPolicy.map((policy) => {
-                    return {
-                        project: { id: seller.project.id, typeOf: chevre.factory.organizationType.Project },
-                        name: { ja: `${policy.merchantReturnDays}日以内:${policy.restockingFee.value}円'` },
-                        typeOf: 'MerchantReturnPolicy',
-                        restockingFee: {
-                            typeOf: 'MonetaryAmount',
-                            currency: 'JPY',
-                            value: policy.restockingFee.value
-                        },
-                        identifier: `SellerReturnPolicy${policy.restockingFee.value}in${policy.merchantReturnDays}`,
-                        merchantReturnDays: policy.merchantReturnDays,
-                        ...(Array.isArray(policy.applicablePaymentMethod))
-                            ? { applicablePaymentMethod: policy.applicablePaymentMethod }
-                            : undefined,
-                        ...(typeof policy.itemCondition?.id === 'string')
-                            ? { itemCondition: policy.itemCondition }
-                            : undefined
-                    };
+                const newPolicies: ISavingReturnPolicy[] = [];
+                hasMerchantReturnPolicy.forEach((policy) => {
+                    if (policy.restockingFee !== undefined) {
+                        newPolicies.push({
+                            project: { id: seller.project.id, typeOf: chevre.factory.organizationType.Project },
+                            name: { ja: `${policy.merchantReturnDays}日以内:${policy.restockingFee.value}円` },
+                            typeOf: 'MerchantReturnPolicy',
+                            restockingFee: {
+                                typeOf: 'MonetaryAmount',
+                                currency: 'JPY',
+                                value: policy.restockingFee.value
+                            },
+                            identifier: `ReturnPolicy${policy.restockingFee.value}in${policy.merchantReturnDays}`,
+                            merchantReturnDays: policy.merchantReturnDays,
+                            ...(Array.isArray(policy.applicablePaymentMethod))
+                                ? { applicablePaymentMethod: policy.applicablePaymentMethod }
+                                : undefined,
+                            ...(typeof policy.itemCondition?.id === 'string')
+                                ? { itemCondition: policy.itemCondition }
+                                : undefined
+                        });
+                    }
+
                 });
+
                 for (const newPolicy of newPolicies) {
                     const existingPolicy = (await sellerReturnPolicyRepo.projectFields(
                         {

package/example/src/chevre/transaction/processReturnOrder.ts

@@ -32,6 +32,7 @@ async function main() {
         project: await chevre.repository.Project.createInstance(mongoose.connection),
         reservation: await chevre.repository.Reservation.createInstance(mongoose.connection),
         seller: await chevre.repository.Seller.createInstance(mongoose.connection),
+        sellerReturnPolicy: await chevre.repository.SellerReturnPolicy.createInstance(mongoose.connection),
         transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
     });
     console.log(result);

package/lib/chevre/service/transaction/returnOrder/preStart.d.ts

@@ -8,6 +8,7 @@ import type { OrderRepo } from '../../../repo/order';
 import type { ProjectRepo } from '../../../repo/project';
 import type { ReservationRepo } from '../../../repo/reservation';
 import type { ISellerWithId, SellerRepo } from '../../../repo/seller';
+import type { SellerReturnPolicyRepo } from '../../../repo/sellerReturnPolicy';
 interface IPreStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
     event: EventRepo;
@@ -18,6 +19,7 @@ interface IPreStartOperationRepos {
     project: ProjectRepo;
     reservation: ReservationRepo;
     seller: SellerRepo;
+    sellerReturnPolicy: SellerReturnPolicyRepo;
 }
 type IPreStartOperation<T> = (repos: IPreStartOperationRepos) => Promise<T>;
 type IFixedSeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;

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

@@ -24,7 +24,6 @@ exports.preStart = preStart;
 const createDebug = require("debug");
 const http_status_1 = require("http-status");
 const moment = require("moment-timezone");
-// import * as request from 'request';
 const factory = require("../../../factory");
 const debug = createDebug('chevre-domain:service');
 /**
@@ -60,10 +59,27 @@ function preStart(params) {
                 typeOf: factory.eventType.ScreeningEvent
             }, ['startDate']);
         }
-        let returnPolicies = seller.hasMerchantReturnPolicy;
-        if (!Array.isArray(returnPolicies)) {
-            returnPolicies = [];
+        const returnPolicies = [];
+        if (Array.isArray(seller.hasMerchantReturnPolicy)) {
+            for (const policy of seller.hasMerchantReturnPolicy) {
+                if (policy.restockingFee !== undefined) {
+                    returnPolicies.push(policy);
+                }
+                else {
+                    // support sellerReturnPolicyRepo(2025-01-19~)
+                    const sellerReturnPolicy = (yield repos.sellerReturnPolicy.projectFields({
+                        limit: 1,
+                        page: 1,
+                        project: { id: { $eq: seller.project.id } },
+                        identifier: { $eq: policy.identifier }
+                    }, ['applicablePaymentMethod', 'identifier', 'itemCondition', 'merchantReturnDays', 'restockingFee', 'typeOf'])).shift();
+                    if (sellerReturnPolicy !== undefined) {
+                        returnPolicies.push(sellerReturnPolicy);
+                    }
+                }
+            }
         }
+        debug('returnOrder.preStart: returnPolicies:', JSON.stringify(returnPolicies));
         // アイテムコンディション取得
         let offerItemConditions = [];
         const itemConditionIds = returnPolicies

package/lib/chevre/service/transaction/returnOrder.d.ts

@@ -10,6 +10,7 @@ import type { OrderRepo } from '../../repo/order';
 import type { ProjectRepo } from '../../repo/project';
 import type { ReservationRepo } from '../../repo/reservation';
 import type { SellerRepo } from '../../repo/seller';
+import type { SellerReturnPolicyRepo } from '../../repo/sellerReturnPolicy';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { IStartedTransaction, TransactionRepo } from '../../repo/transaction';
@@ -24,6 +25,7 @@ interface IStartOperationRepos {
     project: ProjectRepo;
     reservation: ReservationRepo;
     seller: SellerRepo;
+    sellerReturnPolicy: SellerReturnPolicyRepo;
     transaction: TransactionRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.392.0-alpha.10",
-    "@cinerino/sdk": "10.20.0-alpha.7",
+    "@chevre/factory": "4.392.0-alpha.12",
+    "@cinerino/sdk": "10.20.0-alpha.8",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.8.0-alpha.17"
+  "version": "22.8.0-alpha.19"
 }