@chevre/domain 22.5.0-alpha.30 → 22.5.0-alpha.32

package/example/src/chevre/aggregateAllEvents2.ts

@@ -41,7 +41,13 @@ export async function aggregateScreeningEvent() {
                     connection: mongoose.connection,
                     redisClient,
                     credentials: {
-                        sendGrid: await chevre.credentials.SendGrid.createInstance({ apiKey: 'xxx' })
+                        sendGrid: await chevre.credentials.SendGrid.createInstance({ apiKey: 'xxx' }),
+                        lineNotify: await chevre.credentials.LINENotify.createInstance({
+                            url: 'xxx',
+                            accessToken: 'xxx',
+                            accessTokenAlert: 'xxx',
+                            accessTokenInfo: 'xxx'
+                        })
                     },
                     settings: new chevre.settings.Settings({
                         onEventChanged: {

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

@@ -39,6 +39,12 @@ export declare function searchEventSeatOffersWithPaging(params: {
         id: string;
     };
     $projection?: factory.place.seat.IProjection;
+    options: {
+        /**
+         * add option(2024-10-23~)
+         */
+        excludePriceSpecification: boolean;
+    };
 }): (repos: {
     event: EventRepo;
     priceSpecification: PriceSpecificationRepo;

package/lib/chevre/service/offer.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchEventSeatOffersWithPaging = exports.addOffers2Seat = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
-const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../factory");
 const EventOfferService = require("./offer/event");
@@ -21,7 +20,6 @@ const MoneyTransferOfferService = require("./offer/moneyTransfer");
 exports.moneyTransfer = MoneyTransferOfferService;
 const ProductOfferService = require("./offer/product");
 exports.product = ProductOfferService;
-const debug = createDebug('chevre-domain:service:offer');
 /**
  * 座席にオファー情報を付加する
  */
@@ -38,7 +36,6 @@ function addOffers2Seat(params) {
         .map(({ appliesToCategoryCode, name, price, priceCurrency, typeOf, valueAddedTaxIncluded }) => {
         return {
             // optimize appliesToCategoryCode(2024-08-02~)
-            // appliesToCategoryCode,
             appliesToCategoryCode: appliesToCategoryCode.map(({ codeValue, inCodeSet }) => ({ codeValue, inCodeSet, typeOf: 'CategoryCode' })),
             name, price, priceCurrency, typeOf, valueAddedTaxIncluded
         };
@@ -63,6 +60,7 @@ function searchEventSeatOffersWithPaging(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        const { excludePriceSpecification } = params.options;
         let offers = [];
         // optimize(2024-07-18~)
         const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered']);
@@ -110,24 +108,23 @@ function searchEventSeatOffersWithPaging(params) {
                         }
                     }
                 });
-                debug('searchEventSeatOffersWithPaging: uniqueSeatingTypes:', uniqueSeatingTypes, event.project.id, roomBranchCode, movieTheaterBranchCode);
                 // 座席タイプ価格仕様を検索
                 let priceSpecs = [];
-                if (Array.isArray(uniqueSeatingTypes) && uniqueSeatingTypes.length > 0) {
-                    priceSpecs = yield repos.priceSpecification.search({
-                        project: { id: { $eq: event.project.id } },
-                        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                        appliesToCategoryCode: {
-                            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } },
-                            codeValue: { $in: uniqueSeatingTypes } // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
-                        }
-                    });
+                if (!excludePriceSpecification) {
+                    if (Array.isArray(uniqueSeatingTypes) && uniqueSeatingTypes.length > 0) {
+                        priceSpecs = yield repos.priceSpecification.search({
+                            project: { id: { $eq: event.project.id } },
+                            typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                            appliesToCategoryCode: {
+                                inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } },
+                                codeValue: { $in: uniqueSeatingTypes } // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
+                            }
+                        });
+                    }
                 }
                 offers = seats.map((seat, index) => {
                     return addOffers2Seat({
                         seat,
-                        // unavailableOffers: [],
-                        // availability: availabilities[index].availability,
                         availability: (typeof availabilities[index] === 'string')
                             ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
                             : factory.itemAvailability.InStock,

package/lib/chevre/service/reserve/factory.d.ts

@@ -1,67 +1,9 @@
 import * as factory from '../../factory';
-type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
-type IMaskedUnderName = Pick<factory.reservation.IUnderName<factory.reservationType.EventReservation>, 'id' | 'typeOf'>;
 export declare function optimizeUnderName4inform(params: {
     underName: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
-}): IMaskedUnderName;
-interface IProject {
-    id: string;
-    typeOf: factory.organizationType.Project;
-}
-export type ISubReservation4inform = Pick<IEventReservation, 'additionalProperty' | 'additionalTicketText' | 'attended' | 'bookingTime' | 'checkedIn' | 'id' | 'modifiedTime' | 'numSeats' | 'price' | 'programMembershipUsed' | 'reservedTicket' | 'subReservation' | 'typeOf'>;
-/**
- * 確定予約通知
- */
-export interface IReservationPackage4informConfirmed {
-    issuedThrough: factory.reservation.eventReservation.IIssuedThrough;
-    project: IProject;
-    provider: factory.reservation.IProvider;
-    reservationFor: factory.reservation.IReservationFor<factory.reservationType.EventReservation>;
-    reservationNumber: string;
-    reservationStatus: factory.reservationStatusType;
-    subReservation: ISubReservation4inform[];
-    underName?: IMaskedUnderName;
-    typeOf: factory.reservationType.ReservationPackage;
-}
-/**
- * 予約取消通知
- */
-export interface IReservation4informCanceled {
-    typeOf: factory.reservationType.BusReservation | factory.reservationType.EventReservation;
-    project: IProject;
-    id: string;
-    reservationStatus: factory.reservationStatusType.ReservationCancelled;
-    modifiedTime?: Date;
-}
-/**
- * 予約発券通知
- * IDあるいは予約番号で発券
- */
-export interface IReservation4informCheckedIn {
-    typeOf: factory.reservationType.EventReservation;
-    project: IProject;
-    id?: string;
-    reservationNumber?: string;
-    checkedIn: boolean;
-    modifiedTime?: Date;
-}
-/**
- * 予約使用通知
- */
-export interface IReservation4informUsed {
-    typeOf: factory.reservationType.EventReservation;
-    project: IProject;
-    id: string;
-    attended: boolean;
-    modifiedTime?: Date;
-    reservedTicket: {
-        dateUsed?: Date;
-    };
-}
-export type IReservation4inform = IReservationPackage4informConfirmed | IReservation4informCanceled | IReservation4informCheckedIn | IReservation4informUsed;
-export type IInformObject = IReservation4inform[];
+}): factory.notification.reservation.IMaskedUnderName;
 export interface IPotentialInformReservationAction extends factory.task.triggerWebhook.IPotentialInformAction {
-    object: IInformObject;
+    object: factory.notification.reservation.IReservation4inform[];
 }
 export declare const NUM_TRY_INFORM_RESERVATION: number;
 export declare function createMoneyTransferActions(params: {
@@ -79,4 +21,3 @@ export interface IPotentialCancelAction extends factory.action.cancel.reservatio
 export declare function createCancelPendingReservationAction(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
 }): IPotentialCancelAction | undefined;
-export {};

package/lib/chevre/service/reserve/factory.js

@@ -3,17 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCancelPendingReservationAction = exports.createMoneyTransferActions = exports.NUM_TRY_INFORM_RESERVATION = exports.optimizeUnderName4inform = void 0;
 const factory = require("../../factory");
 function optimizeUnderName4inform(params) {
-    // ReservationPackage通知アクションのobject.underNameを最小化(2024-03-19~)
-    // ? {
-    //     ...reservation.underName,
-    //     email: MASKED_PROFILE,
-    //     telephone: MASKED_PROFILE,
-    //     name: MASKED_PROFILE,
-    //     familyName: MASKED_PROFILE,
-    //     givenName: MASKED_PROFILE,
-    //     // identifierも隠蔽(2022-12-27~)
-    //     identifier: []
-    // }
     return { id: params.underName.id, typeOf: params.underName.typeOf };
 }
 exports.optimizeUnderName4inform = optimizeUnderName4inform;

package/lib/chevre/service/task/handleNotification.d.ts

@@ -0,0 +1,3 @@
+import * as factory from '../../factory';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+export declare function call(params: Pick<factory.task.handleNotification.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

package/lib/chevre/service/task/handleNotification.js

@@ -0,0 +1,43 @@
+"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.call = void 0;
+const util = require("util");
+let notification;
+function call(params) {
+    return ({ credentials, settings }) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const { data } = params;
+        let message = `projectId: ${(Array.isArray(data)) ? (_b = (_a = data.at(0)) === null || _a === void 0 ? void 0 : _a.project) === null || _b === void 0 ? void 0 : _b.id : data === null || data === void 0 ? void 0 : data.project.id}
+${util.inspect(data, { depth: 0 })}
+
+taskId: ${params.id}
+`;
+        // 最大 1000文字
+        // tslint:disable-next-line:no-magic-numbers
+        message = `${message.slice(0, 900)}...`;
+        try {
+            if (notification === undefined) {
+                notification = yield Promise.resolve().then(() => require('../notification'));
+            }
+            yield notification.lineNotify({
+                subject: 'Message from handleNotification',
+                content: message,
+                logLevel: 'log'
+            }, { timeout: settings.notification.timeout, useFetchAPI: settings.notification.useFetchAPI })({}, credentials);
+        }
+        catch (error) {
+            // tslint:disable-next-line:no-console
+            console.error('handleNotification: lineNotify failed.', error);
+        }
+    });
+}
+exports.call = call;

package/lib/chevre/service/task.d.ts

@@ -13,6 +13,7 @@ import { Settings } from '../settings';
 interface ICredentialSettings {
     jwt?: JWTCredentials;
     sendGrid: SendGridCredentials;
+    lineNotify: LINENotifyCredentials;
 }
 interface IExecuteSettings {
     /**

package/lib/chevre/service/task.js

@@ -97,6 +97,7 @@ function execute(task) {
                 case factory.taskName.AuthorizePayment:
                 case factory.taskName.CheckMovieTicket:
                 case factory.taskName.DeletePerson:
+                case factory.taskName.HandleNotification:
                 case factory.taskName.Pay:
                 case factory.taskName.PublishPaymentUrl:
                 case factory.taskName.Refund:

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.387.0-alpha.1",
-    "@cinerino/sdk": "10.14.0",
+    "@chevre/factory": "4.388.0-alpha.0",
+    "@cinerino/sdk": "10.15.0",
     "@motionpicture/coa-service": "9.5.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.5.0-alpha.30"
+  "version": "22.5.0-alpha.32"
 }