@chevre/domain 21.21.0 → 21.22.0-alpha.0

package/example/src/chevre/migrateProjectMakesOffer.ts

@@ -0,0 +1,66 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+enum ROLE_NAME {
+    Customer = 'customer',
+    POS = 'pos'
+}
+
+// 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 makesOfferRepo = await chevre.repository.ProjectMakesOffer.createInstance(mongoose.connection);
+
+    const cursor = memberRepo.getCursor(
+        {
+            'member.hasRole.roleName': { $in: [ROLE_NAME.Customer, ROLE_NAME.POS] }
+            // 'member.id': { $eq: '3eo6okferrsdpfd9j2ce1iv9k7' }
+        },
+        {
+            // _id: 1,
+        }
+    );
+    console.log('members found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const iamMember: chevre.factory.iam.IMember = doc.toObject();
+
+        const existingOffers = await makesOfferRepo.search({
+            offeredBy: { id: { $eq: iamMember.project.id } },
+            availableAtOrFrom: { id: { $eq: iamMember.member.id } }
+        });
+        const alreadyMigrated = existingOffers.length === 1;
+
+        if (alreadyMigrated) {
+            console.log(
+                'already exist...', iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, iamMember.member.name, i);
+        } else {
+            console.log(
+                'updating project...',
+                iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, iamMember.member.name, i);
+            await makesOfferRepo.create({
+                availableAtOrFrom: { id: iamMember.member.id },
+                offeredBy: { id: iamMember.project.id }
+            });
+            updateCount += 1;
+            console.log(
+                'updated.',
+                iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, iamMember.member.name, i);
+        }
+    });
+
+    console.log(i, 'members checked');
+    console.log(updateCount, 'members updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -41,6 +41,7 @@ async function main() {
         validateEligibleCustomerType: false
     })({
         member: await chevre.repository.Member.createInstance(mongoose.connection),
+        projectMakesOffer: await chevre.repository.ProjectMakesOffer.createInstance(mongoose.connection),
         seller: await chevre.repository.Seller.createInstance(mongoose.connection),
         transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
     });

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

@@ -1,10 +1,12 @@
 import type { MongoRepository as MemberRepo } from '../../../repo/member';
+import type { MongoRepository as ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { MongoRepository as SellerRepo } from '../../../repo/seller';
 import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
 import * as factory from '../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IStartOperationRepos {
     member: MemberRepo;
+    projectMakesOffer: ProjectMakesOfferRepo;
     seller: SellerRepo;
     transaction: TransactionRepo;
 }

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

@@ -22,9 +22,9 @@ function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const { passport, customerType } = yield (0, validation_1.validateWaiterPassport)(params);
-        const { memeberOfPayload, makesOfferFromClient, seller } = yield (0, validateStartRequest_1.validateStartRequest)(Object.assign({ project: { id: params.project.id }, seller: { id: params.seller.id }, clientUser: params.object.clientUser, memberOfToken: params.agent.memberOfToken }, (params.validateEligibleCustomerType === true
+        const { memeberOfPayload, sellerMakesOffer, seller } = yield (0, validateStartRequest_1.validateStartRequest)(Object.assign({ project: { id: params.project.id }, seller: { id: params.seller.id }, clientUser: params.object.clientUser, memberOfToken: params.agent.memberOfToken }, (params.validateEligibleCustomerType === true
             && typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { customerType } : undefined))(repos);
-        const expiresInSeconds = (_a = makesOfferFromClient === null || makesOfferFromClient === void 0 ? void 0 : makesOfferFromClient.eligibleTransactionDuration) === null || _a === void 0 ? void 0 : _a.maxValue;
+        const expiresInSeconds = (_a = sellerMakesOffer.eligibleTransactionDuration) === null || _a === void 0 ? void 0 : _a.maxValue;
         if (typeof expiresInSeconds !== 'number') {
             throw new factory.errors.NotFound('eligibleTransactionDuration.maxValue');
         }

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

@@ -1,6 +1,7 @@
-import * as factory from '../../../../factory';
 import type { MongoRepository as MemberRepo } from '../../../../repo/member';
+import type { MongoRepository as ProjectMakesOfferRepo } from '../../../../repo/projectMakesOffer';
 import type { MongoRepository as SellerRepo } from '../../../../repo/seller';
+import * as factory from '../../../../factory';
 type ISeller = Pick<factory.seller.ISeller, 'id' | 'name' | 'project' | 'typeOf' | 'makesOffer' | 'additionalProperty'>;
 declare function validateStartRequest(params: {
     project: {
@@ -17,10 +18,11 @@ declare function validateStartRequest(params: {
     memberOfToken?: string;
 }): (repos: {
     member: MemberRepo;
+    projectMakesOffer: ProjectMakesOfferRepo;
     seller: SellerRepo;
 }) => Promise<{
     seller: ISeller;
-    makesOfferFromClient: factory.seller.IMakesOffer;
+    sellerMakesOffer: factory.seller.IMakesOffer;
     memeberOfPayload?: import("@chevre/factory/lib/transaction/placeOrder").IMemberOfPayload | undefined;
 }>;
 export { validateStartRequest };

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateStartRequest = void 0;
 const jwt = require("jsonwebtoken");
 const factory = require("../../../../factory");
+const settings_1 = require("../../../../settings");
 function verifyMembershipToken(params) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
@@ -52,33 +53,40 @@ function verifyMembershipToken(params) {
 function validateStartRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
-        const sellers = yield repos.seller.search({
+        const clientId = (_a = params.clientUser) === null || _a === void 0 ? void 0 : _a.client_id;
+        if (typeof clientId !== 'string' || clientId.length === 0) {
+            throw new factory.errors.ArgumentNull('client_id');
+        }
+        if (settings_1.USE_VALIDATE_PROJECT_MAKES_OFFER) {
+            const projectMakesOffer = (yield repos.projectMakesOffer.search({
+                limit: 1,
+                page: 1,
+                offeredBy: { id: { $eq: params.project.id } },
+                availableAtOrFrom: { id: { $eq: clientId } }
+            })).shift();
+            if (projectMakesOffer === undefined) {
+                throw new factory.errors.Argument('project', 'project makes no offers');
+            }
+        }
+        const seller = (yield repos.seller.search({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
             id: { $eq: params.seller.id }
-        }, ['name', 'project', 'typeOf', 'makesOffer', 'additionalProperty'], []);
-        const seller = sellers.shift();
+        }, ['name', 'project', 'typeOf', 'makesOffer', 'additionalProperty'], [])).shift();
         if (seller === undefined) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);
         }
-        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');
-        }
-        const makesOfferFromClient = (_b = seller.makesOffer) === null || _b === void 0 ? void 0 : _b.find((offer) => {
-            var _a;
-            return (_a = offer.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.some((availableApplication) => availableApplication.id === clientId);
+        const sellerMakesOffer = (_b = seller.makesOffer) === null || _b === void 0 ? void 0 : _b.find(({ availableAtOrFrom }) => {
+            return availableAtOrFrom === null || availableAtOrFrom === void 0 ? void 0 : availableAtOrFrom.some(({ id }) => id === clientId);
         });
-        if (makesOfferFromClient === undefined) {
-            throw new factory.errors.Argument('seller', 'makes no offers');
+        if (sellerMakesOffer === undefined) {
+            throw new factory.errors.Argument('seller', 'seller makes no offers');
         }
         // eligibleCustomerType検証(2023-11-20~)
         const { customerType } = params;
         if (typeof customerType === 'string') {
-            const { eligibleCustomerType } = makesOfferFromClient;
+            const { eligibleCustomerType } = sellerMakesOffer;
             // 適用カスタマータイプが存在すれば検証(存在しなければあらゆるカスタマータイプを受け入れる)
             if (Array.isArray(eligibleCustomerType)) {
                 const isCustomerTypeEligible = eligibleCustomerType.some(({ codeValue }) => codeValue === customerType);
@@ -108,7 +116,7 @@ function validateStartRequest(params) {
                 memeberOfPayload = yield verifyMembershipToken({ token: params.memberOfToken, secret: verifySecret, issuer: verifyIssuer });
             }
         }
-        return { makesOfferFromClient, memeberOfPayload, seller };
+        return { sellerMakesOffer, memeberOfPayload, seller };
     });
 }
 exports.validateStartRequest = validateStartRequest;

package/lib/chevre/settings.d.ts

@@ -42,6 +42,7 @@ export declare const USE_INFORM_ORDER_IN_TRANSIT: boolean;
 export declare const USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING: boolean;
 export declare const USE_MINIMIZED_PAY_TASK: boolean;
 export declare const USE_KANA_NAME_IN_ACCEPTED_OFFER: boolean;
+export declare const USE_VALIDATE_PROJECT_MAKES_OFFER: boolean;
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_KANA_NAME_IN_ACCEPTED_OFFER = exports.USE_MINIMIZED_PAY_TASK = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_VALIDATE_PROJECT_MAKES_OFFER = exports.USE_KANA_NAME_IN_ACCEPTED_OFFER = exports.USE_MINIMIZED_PAY_TASK = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -66,8 +66,7 @@ exports.USE_INFORM_ORDER_IN_TRANSIT = process.env.USE_INFORM_ORDER_IN_TRANSIT ==
 exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = process.env.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING === '1';
 exports.USE_MINIMIZED_PAY_TASK = process.env.USE_MINIMIZED_PAY_TASK === '1';
 exports.USE_KANA_NAME_IN_ACCEPTED_OFFER = process.env.USE_KANA_NAME_IN_ACCEPTED_OFFER === '1';
-// export const USE_OPTIMIZED_CONFIRM_RESERVE_COA_TASK = process.env.USE_OPTIMIZED_CONFIRM_RESERVE_COA_TASK === '1';
-// export const USE_OPTIMIZED_CONFIRM_RESERVE_COA_TASK_VERIFY = process.env.USE_OPTIMIZED_CONFIRM_RESERVE_COA_TASK_VERIFY === '1';
+exports.USE_VALIDATE_PROJECT_MAKES_OFFER = process.env.USE_VALIDATE_PROJECT_MAKES_OFFER === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.21.0"
+  "version": "21.22.0-alpha.0"
 }

package/example/src/chevre/migrateIAMMemberPOSRoles.ts

@@ -1,79 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-const POS_CLIENT_ID = String(process.env.POS_CLIENT_ID);
-enum ROLE_NAME {
-    Customer = 'customer',
-    POS = 'pos'
-}
-
-// 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 cursor = memberRepo.getCursor(
-        {
-            'member.id': { $eq: POS_CLIENT_ID }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('members found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const iamMember: chevre.factory.iam.IMember = doc.toObject();
-
-        const hasCustomerRole = iamMember.member.hasRole.some((role) => role.roleName === ROLE_NAME.Customer);
-        const alreadyMigrated = iamMember.member.hasRole.some((role) => role.roleName === ROLE_NAME.POS);
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist...', iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, iamMember.member.hasRole.length, 'roles', i);
-        } else {
-            if (!hasCustomerRole) {
-                console.error(
-                    'has no customer role!',
-                    iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, iamMember.member.hasRole.length, 'roles', i);
-                throw new Error('has no customer role!');
-            }
-
-            const newHasRole: chevre.factory.iam.IMemberRole[] = iamMember.member.hasRole;
-            newHasRole.push({ roleName: ROLE_NAME.POS, typeOf: chevre.factory.iam.RoleType.OrganizationRole });
-            console.log(
-                'updating reservation...',
-                iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, newHasRole.length, 'roles', i);
-            await memberRepo.updateByMemberId({
-                project: { id: iamMember.project.id },
-                member: {
-                    id: iamMember.member.id,
-                    memberOf: {
-                        id: iamMember.project.id,
-                        typeOf: chevre.factory.organizationType.Project
-                    },
-                    hasRole: newHasRole
-                },
-                $unset: {}
-            });
-            updateCount += 1;
-            console.log(
-                'updated.',
-                iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, newHasRole.length, 'roles', i);
-        }
-    });
-
-    console.log(i, 'members checked');
-    console.log(updateCount, 'members updated');
-}
-
-main()
-    .then()
-    .catch(console.error);