@chevre/domain 21.17.0-alpha.2 → 21.17.0-alpha.3

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

@@ -28,6 +28,7 @@ const CodeService = require("../code");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { passport } = yield (0, validation_1.validateWaiterPassport)(params);
         const sellers = yield repos.seller.search({
             limit: 1,
             page: 1,
@@ -37,7 +38,6 @@ function start(params) {
         if (seller === undefined) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);
         }
-        const passport = yield (0, validation_1.validateWaiterPassport)(params);
         // 金額をfix
         const amount = params.object.amount;
         if (typeof amount.value !== 'number') {

package/lib/chevre/service/transaction/placeOrderInProgress/factory.d.ts

@@ -1,2 +1,2 @@
 import * as factory from '../../../factory';
-export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail & {}, expiresInSeconds: number, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, broker?: factory.order.IBroker): factory.transaction.placeOrder.IStartParams;
+export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, expiresInSeconds: number, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, broker?: factory.order.IBroker, customerType?: string): factory.transaction.placeOrder.IStartParams;

package/lib/chevre/service/transaction/placeOrderInProgress/factory.js

@@ -2,11 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStartParams = void 0;
 const factory = require("../../../factory");
-function createStartParams(params, expiresInSeconds, passport, seller, broker) {
-    var _a, _b, _c, _d;
-    const transactionObject = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ passportToken: (typeof ((_a = params.object.passport) === null || _a === void 0 ? void 0 : _a.token) === 'string') ? params.object.passport.token : undefined }, (passport !== undefined) ? { passport } : undefined), (params.object.clientUser !== undefined && params.object.clientUser !== null)
-        ? { clientUser: params.object.clientUser }
-        : undefined), (typeof ((_b = params.object) === null || _b === void 0 ? void 0 : _b.name) === 'string') ? { name: (_c = params.object) === null || _c === void 0 ? void 0 : _c.name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker: broker } : undefined), (typeof ((_d = params.object.customer) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { customer: params.object.customer } : undefined);
+function createStartParams(params, expiresInSeconds, passport, seller, broker, customerType) {
+    var _a, _b, _c, _d, _e;
+    const transactionObject = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof ((_a = params.object.passport) === null || _a === void 0 ? void 0 : _a.token) === 'string') ? { passportToken: params.object.passport.token } : undefined), (typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { passport } : undefined), (typeof ((_b = params.object.clientUser) === null || _b === void 0 ? void 0 : _b.client_id) === 'string') ? { clientUser: params.object.clientUser } : undefined), (typeof ((_c = params.object) === null || _c === void 0 ? void 0 : _c.name) === 'string') ? { name: (_d = params.object) === null || _d === void 0 ? void 0 : _d.name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker: broker } : undefined), (typeof ((_e = params.object.customer) === null || _e === void 0 ? void 0 : _e.typeOf) === 'string') ? { customer: params.object.customer } : undefined), (typeof customerType === 'string') ? { customerType } : undefined);
     if (typeof seller.id !== 'string') {
         throw new factory.errors.NotFound('seller.id');
     }
@@ -21,11 +19,10 @@ function createStartParams(params, expiresInSeconds, passport, seller, broker) {
             id: seller.id,
             name: seller.name,
             typeOf: seller.typeOf,
-            // 追加特性を追加(2023-08-08~)
-            additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : []
+            additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
         },
         object: transactionObject,
-        expiresInSeconds: expiresInSeconds
+        expiresInSeconds
     };
 }
 exports.createStartParams = createStartParams;

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateSeller.d.ts

@@ -2,6 +2,10 @@ import * as factory from '../../../../factory';
 export declare function validateSeller(params: {
     seller: Pick<factory.seller.ISeller, 'makesOffer'>;
     clientUser?: factory.clientUser.IClientUser;
+    /**
+     * passportによって決定するカスタマータイプ
+     */
+    customerType?: string;
 }): {
     makesOfferFromClient: factory.seller.IMakesOffer;
 };

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateSeller.js

@@ -5,6 +5,8 @@ const factory = require("../../../../factory");
 function validateSeller(params) {
     var _a, _b;
     const clientId = (_a = params.clientUser) === null || _a === void 0 ? void 0 : _a.client_id;
+    // tslint:disable-next-line:no-single-line-block-comment
+    /* istanbul ignore if */
     if (typeof clientId !== 'string' || clientId.length === 0) {
         throw new factory.errors.ArgumentNull('client_id');
     }
@@ -15,6 +17,14 @@ function validateSeller(params) {
     if (makesOfferFromClient === undefined) {
         throw new factory.errors.Argument('seller', 'makes no offers');
     }
+    // eligibleCustomerType検証(2023-11-20~)
+    if (typeof params.customerType === 'string') {
+        const isCustomerTypeEligible = Array.isArray(makesOfferFromClient.eligibleCustomerType)
+            && makesOfferFromClient.eligibleCustomerType.some((categoryCode) => categoryCode.codeValue === params.customerType);
+        if (!isCustomerTypeEligible) {
+            throw new factory.errors.Argument('seller', 'cutomer type ineligible');
+        }
+    }
     return { makesOfferFromClient };
 }
 exports.validateSeller = validateSeller;

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

@@ -23,7 +23,9 @@ export interface IConfirmOperationRepos {
 }
 export type IConfirmOperation<T> = (repos: IConfirmOperationRepos) => Promise<T>;
 export type IPassportValidator = IWaiterPassportValidator;
-export type IStartParams = PlaceOrderFactory.IStartParams;
+export type IStartParams = PlaceOrderFactory.IStartParams & {
+    validateEligibleCustomerType: boolean;
+};
 /**
  * 取引開始
  */

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

@@ -30,6 +30,7 @@ exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
+        const { passport, customerType } = yield (0, validation_2.validateWaiterPassport)(params);
         const sellers = yield repos.seller.search({
             limit: 1,
             page: 1,
@@ -40,15 +41,15 @@ function start(params) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);
         }
         let makesOfferFromClient;
-        const validateSellerResult = (0, validateSeller_1.validateSeller)({ seller, clientUser: params.object.clientUser }); // 販売者オファー検証(2022-10-14~)
+        const validateSellerResult = (0, validateSeller_1.validateSeller)(Object.assign({ seller, clientUser: params.object.clientUser }, (params.validateEligibleCustomerType === true
+            && typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { customerType } : undefined));
         makesOfferFromClient = validateSellerResult.makesOfferFromClient;
-        const passport = yield (0, validation_2.validateWaiterPassport)(params);
         const expiresInSeconds = (_a = makesOfferFromClient === null || makesOfferFromClient === void 0 ? void 0 : makesOfferFromClient.eligibleTransactionDuration) === null || _a === void 0 ? void 0 : _a.maxValue;
         if (typeof expiresInSeconds !== 'number') {
             throw new factory.errors.NotFound('eligibleTransactionDuration.maxValue');
         }
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = (0, factory_1.createStartParams)(params, expiresInSeconds, passport, seller, params.broker);
+        const startParams = (0, factory_1.createStartParams)(params, expiresInSeconds, passport, seller, params.broker, customerType);
         let transaction;
         try {
             transaction = yield repos.transaction.start(startParams);

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

@@ -3,4 +3,7 @@ import { IPassportValidator } from '../../factory/transaction';
 export type IStartParams = (factory.transaction.placeOrder.IStartParamsWithoutDetail | factory.transaction.moneyTransfer.IStartParamsWithoutDetail) & {
     passportValidator?: IPassportValidator;
 };
-export declare function validateWaiterPassport(params: IStartParams): Promise<factory.waiter.passport.IPassport | undefined>;
+export declare function validateWaiterPassport(params: IStartParams): Promise<{
+    passport: factory.waiter.passport.IPassport | undefined;
+    customerType?: string;
+}>;

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

@@ -19,6 +19,7 @@ function validateWaiterPassport(params) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         let passport;
+        let customerType;
         // WAITER許可証トークンがあれば検証する
         if (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.passport) === null || _b === void 0 ? void 0 : _b.token) === 'string') {
             try {
@@ -36,8 +37,13 @@ function validateWaiterPassport(params) {
                     throw new factory.errors.Argument('Passport Token', 'Invalid passport');
                 }
             }
+            // カスタマータイプ決定(2023-11-20~)
+            // スコープのフォーマットは、Transaction:${TransactionType}:${sellerId}:${customerType}
+            const splittedScope = passport.scope.split(':');
+            // tslint:disable-next-line:no-magic-numbers
+            customerType = splittedScope[3];
         }
-        return passport;
+        return { customerType, passport };
     });
 }
 exports.validateWaiterPassport = validateWaiterPassport;

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.17.0-alpha.2"
+  "version": "21.17.0-alpha.3"
 }