@chevre/domain 22.8.0-alpha.20 → 22.8.0-alpha.22

package/lib/chevre/repo/seller.js

@@ -47,7 +47,7 @@ class SellerRepo {
     }
     // 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, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         const andConditions = [];
         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') {
@@ -140,13 +140,23 @@ class SellerRepo {
                 '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;
+        const hasMerchantReturnPolicyIdentifierEq = (_r = (_q = params.hasMerchantReturnPolicy) === null || _q === void 0 ? void 0 : _q.identifier) === null || _r === void 0 ? void 0 : _r.$eq;
+        if (typeof hasMerchantReturnPolicyIdentifierEq === 'string') {
+            andConditions.push({
+                'hasMerchantReturnPolicy.identifier': { $exists: true, $eq: hasMerchantReturnPolicyIdentifierEq }
+            });
+        }
+        // tslint:disable-next-line:no-suspicious-comment
+        // 互換性維持として TODO discontinue
+        const hasMerchantReturnApplicablePaymentMethodEq = (_t = (_s = params.hasMerchantReturnPolicy) === null || _s === void 0 ? void 0 : _s.applicablePaymentMethod) === null || _t === void 0 ? void 0 : _t.$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;
+        // tslint:disable-next-line:no-suspicious-comment
+        // 互換性維持として TODO discontinue
+        const hasMerchantReturnPolicyItemConditionIdEq = (_w = (_v = (_u = params.hasMerchantReturnPolicy) === null || _u === void 0 ? void 0 : _u.itemCondition) === null || _v === void 0 ? void 0 : _v.id) === null || _w === void 0 ? void 0 : _w.$eq;
         if (typeof hasMerchantReturnPolicyItemConditionIdEq === 'string') {
             andConditions.push({
                 'hasMerchantReturnPolicy.itemCondition.id': {

package/lib/chevre/repo/sellerReturnPolicy.js

@@ -33,7 +33,7 @@ class SellerReturnPolicyRepo {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_FILTER_QUERY(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const andConditions = [];
         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') {
@@ -72,6 +72,14 @@ class SellerReturnPolicyRepo {
         if (typeof restockingFeeValueEq === 'number') {
             andConditions.push({ 'restockingFee.value': { $eq: restockingFeeValueEq } });
         }
+        const applicablePaymentMethodEq = (_l = params.applicablePaymentMethod) === null || _l === void 0 ? void 0 : _l.$eq;
+        if (typeof applicablePaymentMethodEq === 'string') {
+            andConditions.push({ applicablePaymentMethod: { $exists: true, $eq: applicablePaymentMethodEq } });
+        }
+        const itemConditionIdEq = (_o = (_m = params.itemCondition) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
+        if (typeof itemConditionIdEq === 'string') {
+            andConditions.push({ 'itemCondition.id': { $exists: true, $eq: itemConditionIdEq } });
+        }
         return andConditions;
     }
     save(params) {

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

@@ -16,6 +16,11 @@ const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
 // import { Settings } from '../../settings';
 const debug = createDebug('chevre-domain:service:order');
+function createReturnPolicy(params) {
+    const { identifier, returnFees, restockingFee, typeOf } = params.returnOrderTransaction.object.returnPolicy;
+    return Object.assign(Object.assign({ returnFees,
+        typeOf }, (typeof identifier === 'string') ? { identifier } : undefined), (typeof (restockingFee === null || restockingFee === void 0 ? void 0 : restockingFee.value) === 'number') ? { restockingFee } : undefined);
+}
 function returnOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos
@@ -54,7 +59,7 @@ function returnOrder(params) {
             typeOf: factory.transactionType.ReturnOrder,
             statuses: [factory.transactionStatusType.Confirmed],
             object: { order: { orderNumbers: [orderNumber] } },
-            inclusion: ['typeOf', 'potentialActions']
+            inclusion: ['typeOf', 'potentialActions', 'object']
         });
         const returnOrderTransaction = returnOrderTransactions.shift();
         if (returnOrderTransaction === undefined) {
@@ -62,23 +67,22 @@ function returnOrder(params) {
         }
         const simpleOrder = {
             typeOf: order.typeOf,
-            // seller: {
-            //     id: order.seller.id,
-            //     typeOf: order.seller.typeOf,
-            //     name: order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
             orderNumber: order.orderNumber,
-            // price: order.price,
-            // priceCurrency: order.priceCurrency,
             orderDate: order.orderDate,
             dateReturned
         };
+        const recipient = {
+            id: order.seller.id,
+            name: order.seller.name,
+            typeOf: order.seller.typeOf
+        };
+        const returnPolicyAsInstrument = createReturnPolicy({ returnOrderTransaction });
         const returnOrderActionAttributes = {
             agent: returner,
+            instrument: [returnPolicyAsInstrument], // add returnPolicy(2025-01-21~)
             object: simpleOrder,
             project: order.project,
-            recipient: order.seller,
+            recipient,
             typeOf: factory.actionType.ReturnAction
         };
         let returnedOwnershipInfos = [];

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.13",
-    "@cinerino/sdk": "10.20.0-alpha.9",
+    "@chevre/factory": "4.392.0-alpha.15",
+    "@cinerino/sdk": "10.20.0-alpha.10",
     "@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.20"
+  "version": "22.8.0-alpha.22"
 }

package/example/src/chevre/migrateValidMemberTiers.ts

@@ -1,110 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
-    const projectMakesOfferRepo = await chevre.repository.ProjectMakesOffer.createInstance(mongoose.connection);
-
-    const cursor = memberRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            // 'member.id': { $eq: 'xxx' },
-            'member.typeOf': { $eq: chevre.factory.creativeWorkType.WebApplication },
-            'member.member': { $exists: true }
-        },
-        {
-            // paymentMethods: 1,
-            // project: 1,
-            // orderDate: 1
-        }
-    );
-    console.log('docs found');
-
-    let updated: number = 0;
-    let i = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const iamMember: chevre.factory.iam.IMember = doc.toObject();
-        const makesOffer = (await projectMakesOfferRepo.search({
-            limit: 1,
-            page: 1,
-            offeredBy: { id: { $eq: iamMember.project.id } },
-            availableAtOrFrom: { id: { $eq: iamMember.member.id } }
-        })).shift();
-        if (makesOffer === undefined) {
-            throw new Error('iamMember not found');
-        }
-        // tslint:disable-next-line:no-null-keyword
-        // console.dir(makesOffer, { depth: null });
-
-        const issuerExpected = (<any>iamMember.member).member?.at(0)?.memberOf?.issuer;
-        const secretExpected = (<any>iamMember.member).member?.at(0)?.memberOf?.secret;
-        if (typeof issuerExpected !== 'string' || typeof secretExpected !== 'string') {
-            throw new Error('issuerExpected,secretExpected must be string');
-        }
-
-        console.log(
-            'checking...',
-            iamMember.member.id,
-            iamMember.member.typeOf,
-            iamMember.project.id,
-            issuerExpected,
-            secretExpected,
-            i
-        );
-
-        const migrated = typeof makesOffer.validForMemberTier?.secret === 'string'
-            && makesOffer.validForMemberTier?.isTierOf.hostingOrganization.identifier === issuerExpected
-            && makesOffer.validForMemberTier?.secret === secretExpected;
-        if (migrated) {
-            console.log(
-                'migrated',
-                iamMember.member.id,
-                iamMember.member.typeOf,
-                iamMember.project.id,
-                issuerExpected,
-                secretExpected,
-                i
-            );
-        } else {
-            await projectMakesOfferRepo.updateOne({
-                availableAtOrFrom: {
-                    id: makesOffer.availableAtOrFrom.id
-                },
-                offeredBy: {
-                    id: iamMember.project.id
-                },
-                validForMemberTier: {
-                    isTierOf: { hostingOrganization: { identifier: issuerExpected } },
-                    secret: secretExpected
-                },
-                ...(Array.isArray(makesOffer.eligibleCustomerType)) ? { eligibleCustomerType: makesOffer.eligibleCustomerType } : undefined
-            });
-            updated += 1;
-            console.log(
-                'updated',
-                iamMember.member.id,
-                iamMember.member.typeOf,
-                iamMember.project.id,
-                issuerExpected,
-                secretExpected,
-                i
-            );
-        }
-    });
-    console.log(i, 'docs checked');
-    console.log('updated:', updated);
-}
-
-main()
-    .then()
-    .catch(console.error);