@chevre/domain 21.18.0-alpha.40 → 21.18.0-alpha.41

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

@@ -22,7 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IKeyOfProjection4product = keyof factory.product.IProduct | '_id';
 /**
@@ -53,7 +53,7 @@ type IUnsetKey = keyof Pick<factory.product.IProduct, 'additionalProperty' | 'av
 export declare class MongoRepository {
     private readonly productModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.product.ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.product.ISearchConditions): FilterQuery<factory.product.IProduct>[];
     findById(conditions: {
         id: string;
     }, inclusion: string[], exclusion: string[]): Promise<factory.product.IProduct | factory.service.paymentService.IService>;

package/lib/chevre/repo/product.js

@@ -227,6 +227,15 @@ class MongoRepository {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = MongoRepository.CREATE_MONGO_CONDITIONS(conditions);
+            // 強制的にtypeOfを絞る
+            andConditions.push({
+                typeOf: {
+                    $in: [
+                        factory.service.paymentService.PaymentServiceType.CreditCard,
+                        factory.service.paymentService.PaymentServiceType.MovieTicket
+                    ]
+                }
+            });
             let projection = {};
             if (Array.isArray(inclusion) && inclusion.length > 0) {
                 inclusion.forEach((field) => {
@@ -272,18 +281,29 @@ class MongoRepository {
      */
     findAvailableChannel(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const paymentServices = yield this.searchPaymentServices({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: params.project.id } },
-                typeOf: { $eq: params.typeOf },
-                id: { $eq: params.id }
-            }, [], []);
-            const paymentServiceSetting = paymentServices.shift();
-            if (paymentServiceSetting === undefined) {
+            let paymentService;
+            if (params.typeOf === factory.service.paymentService.PaymentServiceType.PaymentCard) {
+                paymentService = (yield this.searchProducts({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: { $eq: factory.product.ProductType.PaymentCard },
+                    id: { $eq: params.id }
+                }, ['availableChannel'], [])).shift();
+            }
+            else {
+                paymentService = (yield this.searchPaymentServices({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: { $eq: params.typeOf },
+                    id: { $eq: params.id }
+                }, ['availableChannel'], [])).shift();
+            }
+            if (paymentService === undefined) {
                 throw new factory.errors.NotFound('PaymentService');
             }
-            const availableChannel = paymentServiceSetting.availableChannel;
+            const availableChannel = paymentService.availableChannel;
             if (availableChannel === undefined) {
                 throw new factory.errors.NotFound('paymentService.availableChannel');
             }

package/lib/chevre/service/assetTransaction/pay.js

@@ -36,7 +36,7 @@ function publishPaymentUrl(params) {
         }
         yield validateSeller(params)(repos);
         // 決済サービス確認
-        const paymentServiceId = yield getPaymentServiceId(params)();
+        const paymentServiceId = getPaymentServiceId(params);
         let result;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
@@ -150,29 +150,27 @@ function start(params, options) {
 }
 exports.start = start;
 function getPaymentServiceId(params) {
-    return () => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        let paymentServiceId = '';
-        const paymentServiceType = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf;
-        if (typeof params.object.id === 'string' && params.object.id.length > 0) {
-            paymentServiceId = params.object.id;
-        }
-        else {
-            switch (paymentServiceType) {
-                case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                    // 対面決済は特に何もしない
-                    break;
-                case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                case factory.service.paymentService.PaymentServiceType.CreditCard:
-                case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                    // リクエストでの指定を必須化(2022-04-12~)
-                    throw new factory.errors.ArgumentNull('object.id');
-                default:
-                    throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
-            }
+    var _a;
+    let paymentServiceId = '';
+    const paymentServiceType = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf;
+    if (typeof params.object.id === 'string' && params.object.id.length > 0) {
+        paymentServiceId = params.object.id;
+    }
+    else {
+        switch (paymentServiceType) {
+            case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                // 対面決済は特に何もしない
+                break;
+            case factory.service.paymentService.PaymentServiceType.PaymentCard:
+            case factory.service.paymentService.PaymentServiceType.CreditCard:
+            case factory.service.paymentService.PaymentServiceType.MovieTicket:
+                // リクエストでの指定を必須化(2022-04-12~)
+                throw new factory.errors.ArgumentNull('object.id');
+            default:
+                throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
         }
-        return paymentServiceId;
-    });
+    }
+    return paymentServiceId;
 }
 function fixPaymentService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -184,16 +182,27 @@ function fixPaymentService(params) {
                 // no op
                 // FaceToFaceの場合プロダクトは存在しない
                 break;
+            // PaymentCardの場合、プロダクト検索
+            case factory.service.paymentService.PaymentServiceType.PaymentCard:
+                paymentService = (yield repos.product.searchProducts({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: { $eq: factory.product.ProductType.PaymentCard },
+                    id: { $eq: getPaymentServiceId(params) }
+                }, [], [])).shift();
+                if (paymentService === undefined) {
+                    throw new factory.errors.NotFound('PaymentService');
+                }
+                break;
             default:
-                const paymentServiceId = yield getPaymentServiceId(params)();
-                const paymentServices = yield repos.product.searchPaymentServices({
+                paymentService = (yield repos.product.searchPaymentServices({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },
                     typeOf: { $eq: paymentServiceType },
-                    id: { $eq: paymentServiceId }
-                }, [], []);
-                paymentService = paymentServices.shift();
+                    id: { $eq: getPaymentServiceId(params) }
+                }, [], [])).shift();
                 if (paymentService === undefined) {
                     throw new factory.errors.NotFound('PaymentService');
                 }

package/lib/chevre/service/assetTransaction/refund/factory.d.ts

@@ -6,5 +6,5 @@ export declare function createStartParams(params: factory.assetTransaction.refun
     transactionNumber: string;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     payAction: factory.action.trade.pay.IAction;
-    paymentService?: factory.service.paymentService.IService;
+    paymentService?: factory.product.IProduct | factory.service.paymentService.IService;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Refund>;

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

@@ -54,11 +54,6 @@ exports.createStartParams = createStartParams;
 function createInformPaymentParams(params) {
     var _a, _b, _c;
     const informPaymentParams = [];
-    // 廃止(2022-10-29~)
-    // const informPaymentParamsByGlobalSettings = settings.onPaymentStatusChanged?.informPayment;
-    // if (Array.isArray(informPaymentParamsByGlobalSettings)) {
-    //     informPaymentParams.push(...informPaymentParamsByGlobalSettings);
-    // }
     // プロダクト設定を適用
     const informPaymentParamsByProduct = (_c = (_b = (_a = params.paymentService) === null || _a === void 0 ? void 0 : _a.availableChannel) === null || _b === void 0 ? void 0 : _b.onPaymentStatusChanged) === null || _c === void 0 ? void 0 : _c.informPayment;
     if (Array.isArray(informPaymentParamsByProduct)) {

package/lib/chevre/service/assetTransaction/refund.js

@@ -84,15 +84,27 @@ function fixPaymentService(params) {
                 // no op
                 // FaceToFaceの場合プロダクトは存在しない
                 break;
+            // PaymentCardの場合、プロダクト検索
+            case factory.service.paymentService.PaymentServiceType.PaymentCard:
+                paymentService = (yield repos.product.searchProducts({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.payAction.project.id } },
+                    typeOf: { $eq: factory.product.ProductType.PaymentCard },
+                    id: { $eq: paymentServiceId }
+                }, [], [])).shift();
+                if (paymentService === undefined) {
+                    throw new factory.errors.NotFound('PaymentService');
+                }
+                break;
             default:
-                const paymentServices = yield repos.product.searchPaymentServices({
+                paymentService = (yield repos.product.searchPaymentServices({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.payAction.project.id } },
                     typeOf: { $eq: params.paymentServiceType },
                     id: { $eq: paymentServiceId }
-                }, [], []);
-                paymentService = paymentServices.shift();
+                }, [], [])).shift();
                 if (paymentService === undefined) {
                     throw new factory.errors.NotFound('PaymentService');
                 }

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.347.0-alpha.11",
-    "@cinerino/sdk": "5.4.0",
+    "@chevre/factory": "4.347.0-alpha.12",
+    "@cinerino/sdk": "5.4.0-alpha.7",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.18.0-alpha.40"
+  "version": "21.18.0-alpha.41"
 }