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

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

@@ -172,25 +172,34 @@ function fixOrders(params) {
             project: { id: { $eq: params.project.id } },
             confirmationNumbers: [params.object.order[0].confirmationNumber],
             orderNumbers: [params.object.order[0].orderNumber]
-        }, {
-            // acceptedOffers: 0, // カスタム返品ポリシーに必要
-            customer: 0,
-            orderedItem: 0
-            // paymentMethods: 0 // 適用決済方法検証に必要
-        });
+        }, 
+        // positive projectionで検索(2023-12-08~)
+        {
+            confirmationNumber: 1, dateReturned: 1, orderDate: 1, orderNumber: 1, orderStatus: 1,
+            paymentMethods: 1, price: 1, project: 1, seller: 1, typeOf: 1
+        }
+        // {
+        //     // acceptedOffers: 0, // カスタム返品ポリシーに必要
+        //     customer: 0,
+        //     orderedItem: 0
+        //     // paymentMethods: 0 // 適用決済方法検証に必要
+        // }
+        );
         if (orders.length !== params.object.order.length) {
             throw new factory.errors.NotFound('Order');
         }
-        const offerIds = yield repos.order.searchAcceptedOfferIds({
-            project: { id: { $eq: params.project.id } },
-            confirmationNumbers: [params.object.order[0].confirmationNumber],
-            orderNumbers: [params.object.order[0].orderNumber]
-        });
-        const eventIds = yield repos.order.searchReservationForIdsByOrderNumbers({
+        const offerIds = yield repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
-        });
-        const acceptedOffers = yield repos.order.searchAcceptedOffersByOrderNumbers({
+        }, 'acceptedOffers.id');
+        const eventIds = yield repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
+        }, 'acceptedOffers.itemOffered.reservationFor.id');
+        // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumbers({
+        //     orderNumber: { $in: [params.object.order[0].orderNumber] }
+        // });
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: params.object.order[0].orderNumber },
+            project: { id: { $eq: params.project.id } }
         });
         return { acceptedOffers, eventIds, offerIds, orders };
     });
@@ -208,9 +217,12 @@ function checkUsedReservationExists(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let usedReservationExists = false;
         // 注文に含まれる予約の状態検証
-        const reservationNumbers = yield repos.order.searchReservationNumbersByOrderNumbers({
+        // const reservationNumbers = await repos.acceptedOffer.searchReservationNumbersByOrderNumbers({
+        //     orderNumber: { $in: params.orders.map((order) => order.orderNumber) }
+        // });
+        const reservationNumbers = yield repos.acceptedOffer.distinctValues({
             orderNumber: { $in: params.orders.map((order) => order.orderNumber) }
-        });
+        }, 'acceptedOffers.itemOffered.reservationNumber');
         if (reservationNumbers.length > 0) {
             // 使用済の予約がひとつでもあれば不可
             const existingUsedReservations = yield repos.reservation.search({
@@ -279,42 +291,40 @@ function createOrder4returnPolicy(params) {
         orderDate: params.order.orderDate,
         orderNumber: params.order.orderNumber,
         price: params.order.price,
-        acceptedOffers: (Array.isArray(params.order.acceptedOffers))
-            ? params.order.acceptedOffers.map((o) => {
-                var _a;
-                if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
-                    const reservation = o.itemOffered;
-                    const priceComponent = (_a = o.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
-                    return {
-                        itemOffered: {
-                            additionalProperty: reservation.additionalProperty,
-                            reservationFor: {
-                                doorTime: reservation.reservationFor.doorTime,
-                                endDate: reservation.reservationFor.endDate,
-                                startDate: reservation.reservationFor.startDate
-                                // superEvent: reservation.reservationFor.superEvent
-                            },
-                            reservedTicket: {
-                                ticketedSeat: reservation.reservedTicket.ticketedSeat
-                            }
+        acceptedOffers: params.order.acceptedOffers.map((o) => {
+            var _a;
+            if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
+                const reservation = o.itemOffered;
+                const priceComponent = (_a = o.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
+                return {
+                    itemOffered: {
+                        additionalProperty: reservation.additionalProperty,
+                        reservationFor: {
+                            doorTime: reservation.reservationFor.doorTime,
+                            endDate: reservation.reservationFor.endDate,
+                            startDate: reservation.reservationFor.startDate
+                            // superEvent: reservation.reservationFor.superEvent
                         },
-                        priceSpecification: {
-                            priceComponent: (Array.isArray(priceComponent))
-                                ? priceComponent.map((component) => {
-                                    const { accounting, name, priceCurrency, valueAddedTaxIncluded } = component, postingComponent = __rest(component, ["accounting", "name", "priceCurrency", "valueAddedTaxIncluded"]);
-                                    return postingComponent;
-                                })
-                                : []
+                        reservedTicket: {
+                            ticketedSeat: reservation.reservedTicket.ticketedSeat
                         }
-                    };
-                }
-                else {
-                    return {
-                        priceSpecification: o.priceSpecification
-                    };
-                }
-            })
-            : []
+                    },
+                    priceSpecification: {
+                        priceComponent: (Array.isArray(priceComponent))
+                            ? priceComponent.map((component) => {
+                                const { accounting, name, priceCurrency, valueAddedTaxIncluded } = component, postingComponent = __rest(component, ["accounting", "name", "priceCurrency", "valueAddedTaxIncluded"]);
+                                return postingComponent;
+                            })
+                            : []
+                    }
+                };
+            }
+            else {
+                return {
+                    priceSpecification: o.priceSpecification
+                };
+            }
+        })
     };
 }
 const TIMEOUT = 5000;
@@ -389,7 +399,7 @@ function findApplicableReturnPolicy(params) {
             if (typeof returnPolicySameAsByPoject === 'string' && returnPolicySameAsByPoject.length > 0) {
                 const returnPolicyByProject = yield getReturnPolicyByProject({
                     sameAs: returnPolicySameAsByPoject,
-                    order: params.orders[0] // 同時返品可能な注文数をは1
+                    order: Object.assign(Object.assign({}, params.orders[0]), { acceptedOffers: params.acceptedOffers })
                 });
                 applicalbleReturnPolicies.push(returnPolicyByProject);
             }
@@ -601,6 +611,7 @@ function validateOffersReturnPolicy(params) {
     // 決済カード取消ポリシーを確定(2023-05-23~)
     const returnFeesMovieTicket = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
+        var _a, _b;
         const unitPriceOffer = params.offers.find((offer) => offer.id === acceptedOffer.id);
         if (unitPriceOffer === undefined) {
             throw new factory.errors.NotFound(`UnitPriceOffer ${acceptedOffer.id}`);
@@ -613,11 +624,11 @@ function validateOffersReturnPolicy(params) {
         if (policyByOffer === undefined) {
             throw new factory.errors.NotFound(`MerchantReturnPolicy acceptedOffer:${acceptedOffer.id}`);
         }
-        const movieTicketTypeChargeSpecExists = acceptedOffer.priceSpecification.priceComponent.some((component) => {
+        const movieTicketTypeChargeSpecExists = (_a = acceptedOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent.some((component) => {
             return component.typeOf === factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
         });
-        if (movieTicketTypeChargeSpecExists) {
-            acceptedOffer.priceSpecification.priceComponent.forEach((component) => {
+        if (movieTicketTypeChargeSpecExists === true) {
+            (_b = acceptedOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceComponent.forEach((component) => {
                 if (component.typeOf === factory.priceSpecificationType.UnitPriceSpecification) {
                     if (Array.isArray(component.appliesToMovieTicket)) {
                         component.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
@@ -706,12 +717,19 @@ function confirm(params) {
             emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
         }
         const result = {};
+        const moneyTransferAcceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: transaction.object.order[0].orderNumber },
+            project: { id: { $eq: transaction.project.id } },
+            acceptedOffers: { itemOffered: { typeOf: { $in: [factory.actionType.MoneyTransfer] } } }
+        }, ['itemOffered']);
+        debug(moneyTransferAcceptedOffers.length, 'moneyTransferAcceptedOffers found.', moneyTransferAcceptedOffers);
         const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
             dateReturned: params.object.order.dateReturned,
             orders: orders,
             potentialActions: params.potentialActions,
             transaction: transaction,
-            emailMessageOnOrderReturned: emailMessageOnOrderReturned
+            emailMessageOnOrderReturned: emailMessageOnOrderReturned,
+            moneyTransferAcceptedOffers
         });
         // ステータス変更
         yield repos.transaction.confirm({

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.344.0",
-    "@cinerino/sdk": "5.3.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.4"
+  "version": "21.18.0-alpha.41"
 }

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

@@ -1,29 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-import { findPaymentCardPermit } from '../../../../lib/chevre/service/transaction/orderProgramMembership/findPaymentCardPermit';
-
-const project = { id: String(process.env.PROJECT_ID) };
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-
-    const result = await findPaymentCardPermit({
-        project: { id: project.id },
-        customer: { id: 'a7909268-a584-425e-8212-d7d10f344093' },
-        now: new Date(),
-        accountType: 'Point'
-    })({
-        product: productRepo,
-        ownershipInfo: ownershipInfoRepo
-    });
-    console.log(result);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/lib/chevre/repo/action/registerServiceInProgress.d.ts

@@ -1,29 +0,0 @@
-import { RedisClientType } from 'redis';
-/**
- * 進行アクションキーインターフェース
- */
-export interface IProgressKey {
-    agent: {
-        id: string;
-    };
-    product: {
-        id: string;
-    };
-}
-/**
- * 進行中サービス登録アクションリポジトリ
- */
-export declare class RedisRepository {
-    private static readonly KEY_PREFIX;
-    private readonly redisClient;
-    constructor(redisClient: RedisClientType);
-    /**
-     * ロックする
-     */
-    lock(progressKey: IProgressKey, holder: string): Promise<boolean>;
-    /**
-     * メンバーシップ登録進行ロックを解除する
-     */
-    unlock(progressKey: IProgressKey): Promise<void>;
-    getHolder(progressKey: IProgressKey): Promise<string | null>;
-}

package/lib/chevre/repo/action/registerServiceInProgress.js

@@ -1,58 +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.RedisRepository = void 0;
-/**
- * 進行中サービス登録アクションリポジトリ
- */
-class RedisRepository {
-    constructor(redisClient) {
-        this.redisClient = redisClient;
-    }
-    /**
-     * ロックする
-     */
-    lock(progressKey, holder) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
-            const ttl = 7200;
-            const [setNXReply] = yield this.redisClient.multi()
-                .setNX(key, holder)
-                .expire(key, ttl)
-                .exec();
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else: please write tests */
-            if (setNXReply === 1 || setNXReply === true) {
-                return true;
-            }
-            else {
-                throw new Error('Already in progress.');
-            }
-        });
-    }
-    /**
-     * メンバーシップ登録進行ロックを解除する
-     */
-    unlock(progressKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
-            yield this.redisClient.del([key]);
-        });
-    }
-    getHolder(progressKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
-            return this.redisClient.get(key);
-        });
-    }
-}
-RedisRepository.KEY_PREFIX = 'cinerino:registerProgramMembershipActionInProgress';
-exports.RedisRepository = RedisRepository;

package/lib/chevre/service/order/onOrderStatusChanged/factory.d.ts

@@ -1,42 +0,0 @@
-import * as factory from '../../../factory';
-type IOrderWithToken = factory.order.IOrder & {
-    token: string;
-};
-export declare function getOrderWithToken(params: {
-    order: factory.order.IOrder;
-    expiresIn: number;
-}): Promise<factory.order.IOrder | IOrderWithToken>;
-export type IUpdatedOrder4inform = Pick<factory.order.IOrder, 'typeOf' | 'orderNumber' | 'name' | 'additionalProperty' | 'project'> & {
-    orderStatus?: undefined;
-    updatedAt: Date;
-};
-export declare function createInformTasks(order: factory.order.IOrder | IOrderWithToken | IUpdatedOrder4inform): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
-export declare function createConfirmReservationActionObject4ChevreByOrder(params: {
-    order: factory.order.IOrder;
-}): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre>[];
-export declare function createConfirmReservationActionObject4COAByOrder(params: {
-    order: factory.order.IOrder;
-}): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.COA>[];
-export declare function createConfirmRegisterServiceActionObjectByOrder(params: {
-    order: factory.order.IOrder;
-}): factory.action.interact.confirm.registerService.IObject[];
-export type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
-/**
- * 注文配送後のアクション
- */
-export declare function createOnOrderSentTasksByTransaction(params: {
-    potentialActions?: factory.action.transfer.send.order.IPotentialActions;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
-/**
- * 注文返品後のアクション
- */
-export declare function createOnOrderReturnedTasksByTransaction(params: {
-    potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
-/**
- * 注文中止時のアクション
- */
-export declare function createOnOrderCancelledTasksByTransaction(params: {
-    transaction?: factory.transaction.placeOrder.ITransaction;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
-export {};