@chevre/domain 21.22.0-alpha.1 → 21.22.0

package/example/src/chevre/migrateProjectMakesOffer.ts

@@ -8,6 +8,8 @@ enum ROLE_NAME {
     Customer = 'customer',
     POS = 'pos'
 }
+const CLIENT_ID = '5glmsqlnlmbri3bgruddoe78lb';
+const CUSTOMER_TYPE = 'POS';
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
@@ -18,8 +20,8 @@ async function main() {
 
     const cursor = memberRepo.getCursor(
         {
-            'member.hasRole.roleName': { $in: [ROLE_NAME.Customer, ROLE_NAME.POS] }
-            // 'member.id': { $eq: '3eo6okferrsdpfd9j2ce1iv9k7' }
+            'member.hasRole.roleName': { $in: [ROLE_NAME.Customer, ROLE_NAME.POS] },
+            'member.id': { $eq: CLIENT_ID }
         },
         {
             // _id: 1,
@@ -37,7 +39,10 @@ async function main() {
             offeredBy: { id: { $eq: iamMember.project.id } },
             availableAtOrFrom: { id: { $eq: iamMember.member.id } }
         });
-        const alreadyMigrated = existingOffers.length === 1;
+        const alreadyMigrated = existingOffers.length === 1
+            && Array.isArray(existingOffers[0].eligibleCustomerType)
+            && existingOffers[0].eligibleCustomerType.length === 1
+            && existingOffers[0].eligibleCustomerType[0].codeValue === CUSTOMER_TYPE;
 
         if (alreadyMigrated) {
             console.log(
@@ -46,8 +51,11 @@ async function main() {
             console.log(
                 'updating project...',
                 iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, iamMember.member.name, i);
-            await makesOfferRepo.create({
+            await makesOfferRepo.updateOne({
                 availableAtOrFrom: { id: iamMember.member.id },
+                eligibleCustomerType: [{
+                    codeValue: CUSTOMER_TYPE
+                }],
                 offeredBy: { id: iamMember.project.id }
             });
             updateCount += 1;

package/example/src/chevre/searchAvaialbleAppliesToMovieTicketByOfferCatalogId.ts

@@ -15,11 +15,10 @@ async function main() {
         limit: 10,
         page: 1,
         subOfferCatalog: {
-            id: '0001',
-            isOfferCatalogItem: false
+            id: '0001'
+            // isOfferCatalogItem: false
         },
         excludeAppliesToMovieTicket: false,
-        useIncludeInDataCatalog: true,
         unacceptedPaymentMethod: []
     });
     console.log(result);
@@ -28,7 +27,6 @@ async function main() {
     result = await (await chevre.service.offer.createService()).event.searchOfferAppliesToMovieTicket({
         event: { id: 'cllkq475p' },
         onlyValid: true,
-        useIncludeInDataCatalog: true,
         limit: 100,
         page: 1
         // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined

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

@@ -146,14 +146,12 @@ export declare class MongoRepository {
              * サブカタログID
              */
             id: string;
-            isOfferCatalogItem: boolean;
         };
         availableAtOrFrom?: {
             id?: string;
         };
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
-        useIncludeInDataCatalog: boolean;
         onlyValid?: boolean;
         limit?: number;
         page?: number;

package/lib/chevre/repo/offer.js

@@ -622,17 +622,19 @@ class MongoRepository {
     searchAvaialbleAppliesToMovieTicketByOfferCatalogId(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let sortedOfferIds = [];
-            if (!params.useIncludeInDataCatalog) {
-                // useIncludeInDataCatalogでない場合のみ集計オファーIDリストを検索する
-                sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
-                    id: params.subOfferCatalog.id,
-                    isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem
-                });
-            }
-            const searchOffersConditions = Object.assign(Object.assign(Object.assign({}, (params.useIncludeInDataCatalog)
-                ? { includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } }
-                : { parentOffer: { id: { $in: sortedOfferIds } } }), (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+            // let sortedOfferIds: string[] = [];
+            // if (!params.useIncludeInDataCatalog) {
+            //     // useIncludeInDataCatalogでない場合のみ集計オファーIDリストを検索する
+            //     sortedOfferIds = await this.searchAggregateOfferIdsBySubOfferCatalog({
+            //         id: params.subOfferCatalog.id,
+            //         isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem
+            //     });
+            // }
+            const searchOffersConditions = Object.assign(Object.assign({ 
+                // ...(params.useIncludeInDataCatalog)
+                //     ? { includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } }
+                //     : { parentOffer: { id: { $in: sortedOfferIds } } },
+                includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                 ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } }
                 : undefined), { priceSpecification: {
                     appliesToMovieTicket: Object.assign({ 

package/lib/chevre/service/offer/event/searchEventTicketOffers.d.ts

@@ -76,7 +76,6 @@ declare function searchOfferAppliesToMovieTicket(params: {
      * 有効なオファーのみ対象とするか
      */
     onlyValid?: boolean;
-    useIncludeInDataCatalog: boolean;
 }): (repos: {
     event: EventRepo;
     offer: OfferRepo;

package/lib/chevre/service/offer/event/searchEventTicketOffers.js

@@ -397,19 +397,20 @@ function searchOfferAppliesToMovieTicket(params) {
         }
         // サブカタログIDを決定
         let subOfferCatalogId = catalogId;
-        let isOfferCatalogItem = false;
+        // let isOfferCatalogItem: boolean = false;
         const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
         if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
             subOfferCatalogId = offerCatalogFirstElement.id;
-            isOfferCatalogItem = true;
+            // isOfferCatalogItem = true;
         }
         return repos.offer.searchAvaialbleAppliesToMovieTicketByOfferCatalogId({
-            subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
+            // subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
+            subOfferCatalog: { id: subOfferCatalogId },
             availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
             unacceptedPaymentMethod: unacceptedPaymentMethod,
             excludeAppliesToMovieTicket: excludeAppliesToMovieTicket,
             onlyValid: params.onlyValid === true,
-            useIncludeInDataCatalog: params.useIncludeInDataCatalog,
+            // useIncludeInDataCatalog: params.useIncludeInDataCatalog,
             limit: params.limit,
             page: params.page
         });

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

@@ -78,7 +78,7 @@ function confirm(params) {
                 expiresInSeconds: publishCodeExpiresInSeconds
             })(repos);
         }
-        const { orderWithAcceptedOffers, result, eventId, reservationIds } = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions: completedAuthorizeActions, code }));
+        const { result, eventId, reservationIds } = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions: completedAuthorizeActions, code }));
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
@@ -92,8 +92,8 @@ function confirm(params) {
         }
         // ポストアクションを作成
         const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
-            // order: result.order,
-            order: orderWithAcceptedOffers,
+            order: result.order,
+            // order: orderWithAcceptedOffers, // 現時点でcreateEmailMessageでorder.acceptedOffersを使用している(2024-02-06~)
             potentialActions: params.potentialActions,
             transaction: transaction,
             emailMessage: emailMessageOnOrderSent,
@@ -158,9 +158,6 @@ function createResult(params) {
         orderNumber: params.orderNumber,
         transaction: transaction,
         orderDate: params.result.order.orderDate,
-        // OrderPaymentDueオプションを追加(2023-08-25~)
-        // 注文作成時のステータスとなる
-        // orderStatus: (USE_ORDER_PAYMENT_DUE_ON_PLACED) ? factory.orderStatus.OrderPaymentDue : factory.orderStatus.OrderProcessing,
         orderStatus: factory.orderStatus.OrderPaymentDue,
         isGift: false,
         authorizeActions: params.authorizeActions
@@ -191,13 +188,8 @@ function createResult(params) {
     order.identifier = identifier;
     order.url = url;
     const authorizeActions = params.authorizeActions.map(({ id }) => ({ id }));
-    let orderAsResult;
-    // if (USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT) {
-    //     orderAsResult = order;
-    // } else {
-    // }
     const { acceptedOffers } = order, orderWithoutAcceptedOffers = __rest(order, ["acceptedOffers"]);
-    orderAsResult = orderWithoutAcceptedOffers;
+    const orderAsResult = orderWithoutAcceptedOffers;
     let eventId;
     let reservationIds;
     if (params.options.expectsReservationIds) {

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

@@ -11,17 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
 const givePointAward_1 = require("./potentialActions/givePointAward");
-// import { createMoneyTransferActions } from './potentialActions/moneyTransfer';
-// import { createRegisterServiceActions } from './potentialActions/registerService';
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 /**
  * 取引のポストアクションを作成する
  */
 function createPotentialActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        // const registerServiceActions = await createRegisterServiceActions(params);
-        // 通貨転送アクション
-        // const moneyTransferActions = await createMoneyTransferActions(params);
         // ポイントインセンティブに対する承認アクションの分だけ、ポイントインセンティブ付与アクションを作成する
         const givePointAwardActions = yield (0, givePointAward_1.createGivePointAwardActions)(params);
         // 注文配送メール送信設定
@@ -35,20 +30,6 @@ function createPotentialActions(params) {
         };
         // optimize(2024-01-22~)
         return {
-            // order: {
-            //     project: params.transaction.project,
-            //     typeOf: factory.actionType.OrderAction,
-            //     object: simpleOrder,
-            //     agent: params.transaction.project,
-            //     potentialActions: {
-            //         givePointAward: givePointAwardActions,
-            //         sendOrder: sendOrderActionAttributes // optimize(2024-01-16~)
-            //     },
-            //     purpose: {
-            //         typeOf: params.transaction.typeOf,
-            //         id: params.transaction.id
-            //     }
-            // }
             order: {
                 potentialActions: {
                     givePointAward: givePointAwardActions,

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.22.0-alpha.1"
+  "version": "21.22.0"
 }

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

@@ -1,7 +0,0 @@
-import * as factory from '../../../../factory';
-export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
-export declare function createMoneyTransferActions(params: {
-    order: factory.order.IOrder;
-    transaction: factory.transaction.placeOrder.ITransaction;
-    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
-}): Promise<factory.action.interact.confirm.moneyTransfer.IAttributes[]>;

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

@@ -1,57 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMoneyTransferActions = void 0;
-const factory = require("../../../../factory");
-const order_1 = require("../../../../factory/order");
-function createMoneyTransferActions(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const moneyTransferActions = [];
-        const authorizeMoneyTransferActions = params.authorizeActions
-            .filter((a) => a.object.typeOf === factory.offerType.Offer)
-            .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });
-        const moneyTransferPurpose = {
-            typeOf: params.order.typeOf,
-            seller: {
-                id: params.order.seller.id,
-                typeOf: params.order.seller.typeOf,
-                name: params.order.seller.name
-            },
-            // mask
-            customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
-            orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
-            orderDate: params.order.orderDate
-        };
-        // const paymentMethod = params.order.paymentMethods[0];
-        authorizeMoneyTransferActions.forEach((a) => {
-            var _a;
-            const actionResult = a.result;
-            if (actionResult !== undefined) {
-                const pendingTransaction = (_a = a.object.itemOffered.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction;
-                moneyTransferActions.push({
-                    project: params.transaction.project,
-                    typeOf: factory.actionType.ConfirmAction,
-                    object: {
-                        // pendingTransaction: { id: actionResult.responseBody.id },
-                        transactionNumber: pendingTransaction.transactionNumber,
-                        typeOf: factory.assetTransactionType.MoneyTransfer
-                    },
-                    agent: params.transaction.project,
-                    purpose: moneyTransferPurpose
-                });
-            }
-        });
-        return moneyTransferActions;
-    });
-}
-exports.createMoneyTransferActions = createMoneyTransferActions;

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

@@ -1,6 +0,0 @@
-import * as factory from '../../../../factory';
-export declare function createRegisterServiceActions(params: {
-    order: factory.order.IOrder;
-    transaction: factory.transaction.placeOrder.ITransaction;
-    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
-}): Promise<factory.action.interact.confirm.registerService.IAttributes[]>;

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

@@ -1,78 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRegisterServiceActions = void 0;
-const factory = require("../../../../factory");
-const availableProductTypes_1 = require("../../../../factory/availableProductTypes");
-const order_1 = require("../../../../factory/order");
-function createRegisterServiceActions(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const registerServiceActions = [];
-        const authorizeProductOfferActions = params.authorizeActions
-            .filter((a) => Array.isArray(a.object)
-            && a.object.length > 0
-            && a.object[0].typeOf === factory.offerType.Offer
-            && availableProductTypes_1.availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0);
-        const registerServicePurpose = {
-            typeOf: params.order.typeOf,
-            seller: {
-                id: params.order.seller.id,
-                typeOf: params.order.seller.typeOf,
-                name: params.order.seller.name
-            },
-            // mask
-            customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
-            orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
-            orderDate: params.order.orderDate
-        };
-        authorizeProductOfferActions.forEach((a) => {
-            var _a;
-            const actionResult = a.result;
-            if (actionResult !== undefined) {
-                const registerServiceObject = createRegisterServiceActionObject({
-                    order: params.order,
-                    // potentialActions: params.potentialActions,
-                    transaction: params.transaction,
-                    transactionNumber: (_a = a.instrument) === null || _a === void 0 ? void 0 : _a.transactionNumber
-                });
-                // 廃止(2023-08-18~)
-                // const orderProgramMembershipTask = createOrderProgramMembershipTask({
-                //     order: params.order,
-                //     authorizeAction: a
-                // });
-                registerServiceActions.push({
-                    project: params.transaction.project,
-                    typeOf: factory.actionType.ConfirmAction,
-                    object: registerServiceObject,
-                    agent: params.transaction.project,
-                    purpose: registerServicePurpose,
-                    potentialActions: {
-                    // ...(orderProgramMembershipTask !== undefined)
-                    //     ? { orderProgramMembership: [orderProgramMembershipTask] }
-                    //     : undefined
-                    }
-                });
-            }
-        });
-        return registerServiceActions;
-    });
-}
-exports.createRegisterServiceActions = createRegisterServiceActions;
-function createRegisterServiceActionObject(params) {
-    return {
-        transactionNumber: params.transactionNumber,
-        endDate: params.order.orderDate,
-        // object: {},
-        typeOf: factory.assetTransactionType.RegisterService
-    };
-}