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

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.js

@@ -53,8 +53,7 @@ function processOrder(params) {
         if (params.order.itemOfferedTypeOf === factory.actionType.MoneyTransfer) {
             await createConfirmMoneyTransferTasksIfNotExist(params.order, simpleOrder)(repos);
         }
-        else if (params.order.itemOfferedTypeOf === factory.reservationType.BusReservation
-            || params.order.itemOfferedTypeOf === factory.reservationType.EventReservation) {
+        else if (params.order.itemOfferedTypeOf === factory.reservationType.EventReservation) {
             // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
             await createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder, params.options)(repos);
         }

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.d.ts

@@ -3,19 +3,20 @@ import type { IPlacingOrder, OrderInTransactionRepo } from '../../../repo/orderI
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
+interface ICreatePlacingOrderFromExistingTransactionRepos {
+    action: ActionRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    placeOrder: PlaceOrderRepo;
+}
 declare function createPlacingOrderFromExistingTransaction(params: {
     project: {
         id: string;
     };
     confirmationNumber: string;
     orderNumber: string;
-}): (repos: {
-    action: ActionRepo;
-    orderInTransaction: OrderInTransactionRepo;
-    placeOrder: PlaceOrderRepo;
-}) => Promise<{
+}): (repos: ICreatePlacingOrderFromExistingTransactionRepos) => Promise<{
     order: IPlacingOrder;
     placeOrderTransaction: IPlaceOrderTransaction;
     serialNumbers: string[];
 }>;
-export { createPlacingOrderFromExistingTransaction };
+export { ICreatePlacingOrderFromExistingTransactionRepos, createPlacingOrderFromExistingTransaction };

package/lib/chevre/service/order/placeOrder/factory/orderedItem.js

@@ -88,26 +88,6 @@ function reservationOffers2orderedItem(params) {
                 : undefined
         };
     }
-    else if (reservationFor.typeOf === factory.tripType.BusTrip
-        && issuedThrough.typeOf === factory.product.ProductType.Transportation) {
-        const reservationFor4orderedItem = {
-            typeOf: reservationFor.typeOf,
-            id: reservationFor.id,
-            departureTime: reservationFor.departureTime,
-            arrivalTime: reservationFor.arrivalTime
-        };
-        return {
-            typeOf: issuedThrough.typeOf,
-            id: issuedThrough.id,
-            ...(typeof issuedThrough.serviceType?.typeOf === 'string')
-                ? { serviceType: issuedThrough.serviceType }
-                : undefined,
-            serviceOutput: {
-                typeOf: factory.reservationType.ReservationPackage,
-                reservationFor: reservationFor4orderedItem
-            }
-        };
-    }
     else {
         throw new factory.errors.Internal('unexpected params on reservationOffers2orderedItem');
     }

package/lib/chevre/service/order/placeOrder/factory.js

@@ -110,7 +110,6 @@ function createPlacingOrder(params) {
     params.acceptedOffers.forEach((acceptedOffer) => {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
-            case factory.reservationType.BusReservation:
             case factory.reservationType.EventReservation:
                 eventReservationAcceptedOffers.push(acceptedOffer);
                 break;

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

@@ -2,5 +2,4 @@
  * レポートサービス
  */
 import * as OwnershipInfoService from './report/ownershipInfo';
-import * as TelemetryService from './report/telemetry';
-export { OwnershipInfoService as ownershipInfo, TelemetryService as telemetry };
+export { OwnershipInfoService as ownershipInfo };

package/lib/chevre/service/report.js

@@ -23,11 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.telemetry = exports.ownershipInfo = void 0;
+exports.ownershipInfo = void 0;
 /**
  * レポートサービス
  */
 const OwnershipInfoService = __importStar(require("./report/ownershipInfo"));
 exports.ownershipInfo = OwnershipInfoService;
-const TelemetryService = __importStar(require("./report/telemetry"));
-exports.telemetry = TelemetryService;

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

@@ -115,9 +115,7 @@ function cancelPengindIfNotYet(params) {
                                             subReservation: cancelingSubReservation.subReservation,
                                             reservationFor: {
                                                 id: String(reservationFor.id),
-                                                startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                                                    ? reservationFor.startDate
-                                                    : reservationFor.departureTime
+                                                startDate: reservationFor.startDate
                                             }
                                         },
                                         // holder:取引番号に対応(2023-06-05~)
@@ -220,9 +218,7 @@ function cancelReservation(actionAttributesList) {
                                         subReservation: cancelingSubReservation.subReservation,
                                         reservationFor: {
                                             id: String(reservationFor.id),
-                                            startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                                                ? reservationFor.startDate
-                                                : reservationFor.departureTime
+                                            startDate: reservationFor.startDate
                                         }
                                     },
                                     // holder:取引番号に対応(2023-06-05~)
@@ -439,11 +435,8 @@ function processUnlockOfferRateLimit(params) {
                     }
                 },
                 reservationFor: {
-                    startDate: (params.reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                        ? (0, moment_1.default)(params.reservationFor.startDate)
-                            .toDate()
-                        : (0, moment_1.default)(params.reservationFor.departureTime)
-                            .toDate()
+                    startDate: (0, moment_1.default)(params.reservationFor.startDate)
+                        .toDate()
                 },
                 reservationNumber: reservation.reservationNumber
             };

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

@@ -2,7 +2,7 @@ import * as factory from '../../factory';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
-type AvailableReservationType = factory.reservationType.BusReservation | factory.reservationType.EventReservation;
+type AvailableReservationType = factory.reservationType.EventReservation;
 type IReservationResult = Pick<factory.reservation.IReservation<AvailableReservationType>, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
     reservedTicket: {
         ticketType: Pick<factory.reservation.ITicketType<AvailableReservationType>, 'identifier'> & {

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.d.ts

@@ -5,12 +5,11 @@ import * as factory from '../../../factory';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 export type ICanceledEventReservation = Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
-export type ICanceledBusReservation = Pick<factory.reservation.IReservation<factory.reservationType.BusReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
 export declare function onReservationCanceled(
 /**
  * ステータス変更された予約リスト
  */
-canceledReservations: ICanceledEventReservation[] | ICanceledBusReservation[], 
+canceledReservations: ICanceledEventReservation[], 
 /**
  * 集計対象イベント
  */

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.js

@@ -34,6 +34,7 @@ function onReservationCanceled(
 /**
  * ステータス変更された予約リスト
  */
+// canceledReservations: ICanceledEventReservation[] | ICanceledBusReservation[],
 canceledReservations, 
 // useInformReservation: boolean,
 /**

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

@@ -7,7 +7,7 @@ type IReservationResult = Pick<factory.reservation.IReservation<factory.reservat
 declare function searchByOrder(params: {
     limit: number;
     page: number;
-    typeOf: factory.reservationType.BusReservation | factory.reservationType.EventReservation;
+    typeOf: factory.reservationType.EventReservation;
     project: {
         id: string;
     };

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

@@ -29,6 +29,7 @@ const factory = __importStar(require("../../factory"));
 const voidTransaction_1 = require("../offer/event/voidTransaction");
 const action_1 = require("../../repo/action");
 const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
+const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
@@ -82,6 +83,7 @@ function call(params) {
             })({
                 action: new action_1.ActionRepo(connection),
                 acceptCOAOfferAction: new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection),
+                authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 stockHolder: new stockHolder_1.StockHolderRepo({ connection }),
                 offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),

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

@@ -274,8 +274,7 @@ function validateAcceptedOffers(params) {
     // チケット識別子ユニークネス検証(2024-04-16~)
     let ticketIdentifiers = [];
     params.acceptedOffers.forEach(({ itemOffered }) => {
-        if (itemOffered.typeOf === factory.reservationType.BusReservation
-            || itemOffered.typeOf === factory.reservationType.EventReservation) {
+        if (itemOffered.typeOf === factory.reservationType.EventReservation) {
             if (typeof itemOffered.reservedTicket.identifier === 'string') {
                 ticketIdentifiers.push(itemOffered.reservedTicket.identifier);
             }
@@ -292,8 +291,7 @@ function validateAcceptedOffers(params) {
     // チケット識別子ユニークネス検証(2024-04-15~)
     let ticketNumbers = [];
     params.acceptedOffers.forEach(({ itemOffered }) => {
-        if (itemOffered.typeOf === factory.reservationType.BusReservation
-            || itemOffered.typeOf === factory.reservationType.EventReservation) {
+        if (itemOffered.typeOf === factory.reservationType.EventReservation) {
             if (typeof itemOffered.reservedTicket.ticketNumber === 'string') {
                 ticketNumbers.push(itemOffered.reservedTicket.ticketNumber);
             }

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

@@ -298,8 +298,7 @@ function createReservationIdsResult(order, acceptedOffers) {
             eventId = eventIdsByOrder[0];
             if (Array.isArray(acceptedOffers)) {
                 acceptedOffers.forEach((o) => {
-                    if (o.itemOffered.typeOf === factory.reservationType.EventReservation
-                        || o.itemOffered.typeOf === factory.reservationType.BusReservation) {
+                    if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
                         reservationIds.push(o.itemOffered.id);
                     }
                 });
@@ -316,7 +315,6 @@ function createResult(params, options) {
     params.acceptedOffers.forEach((acceptedOffer) => {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
-            case factory.reservationType.BusReservation:
             case factory.reservationType.EventReservation:
                 eventReservationAcceptedOffers.push(acceptedOffer);
                 break;

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

@@ -138,8 +138,7 @@ function validateOrder(params) {
         let reservationReservedTicketIdentifiers = [];
         acceptedOffers.forEach(({ itemOffered }) => {
             itemOfferedTypeOfs.push(itemOffered.typeOf);
-            if (itemOffered.typeOf === factory.reservationType.BusReservation
-                || itemOffered.typeOf === factory.reservationType.EventReservation) {
+            if (itemOffered.typeOf === factory.reservationType.EventReservation) {
                 reservationForIds.push(itemOffered.reservationFor.id);
                 if (typeof itemOffered.reservedTicket.identifier === 'string') {
                     reservationReservedTicketIdentifiers.push(itemOffered.reservedTicket.identifier);
@@ -166,7 +165,6 @@ function validateOrder(params) {
         let numOrderedItemExpected = 0;
         const itemOfferedTypeOf = itemOfferedTypeOfs[0];
         switch (itemOfferedTypeOf) {
-            case factory.reservationType.BusReservation:
             case factory.reservationType.EventReservation:
                 numOrderedItemExpected = reservationForIds.length;
                 const reservationAcceptedOffers = acceptedOffers;

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.4.0-alpha.32",
+    "@chevre/factory": "5.4.0-alpha.33",
     "@cinerino/sdk": "13.1.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.30"
+  "version": "24.0.0-alpha.32"
 }

package/lib/chevre/repo/mongoose/schemas/telemetry.d.ts

@@ -1,10 +0,0 @@
-import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
-import { IVirtuals } from '../virtuals';
-type IDocType = any;
-type IModel = Model<IDocType, {}, {}, IVirtuals>;
-type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, IVirtuals, {}, ISchemaDefinition, IDocType>;
-declare const modelName = "Telemetry";
-declare function createSchema(): ISchema;
-declare const indexes: [d: IndexDefinition, o: IndexOptions][];
-export { createSchema, IDocType, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/schemas/telemetry.js

@@ -1,80 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.modelName = exports.indexes = void 0;
-exports.createSchema = createSchema;
-const mongoose_1 = require("mongoose");
-const writeConcern_1 = require("../writeConcern");
-// import * as factory from '../../../factory';
-const settings_1 = require("../../../settings");
-const modelName = 'Telemetry';
-exports.modelName = modelName;
-const schemaDefinition = {
-    project: mongoose_1.SchemaTypes.Mixed,
-    result: mongoose_1.SchemaTypes.Mixed,
-    error: mongoose_1.SchemaTypes.Mixed,
-    object: mongoose_1.SchemaTypes.Mixed,
-    startDate: Date,
-    endDate: Date,
-    purpose: mongoose_1.SchemaTypes.Mixed
-};
-const schemaOptions = {
-    autoIndex: settings_1.MONGO_AUTO_INDEX,
-    autoCreate: false,
-    collection: 'telemetries',
-    id: true,
-    read: settings_1.MONGO_READ_PREFERENCE,
-    writeConcern: writeConcern_1.writeConcern,
-    strict: true,
-    strictQuery: false,
-    timestamps: false, // 2024-08-07~
-    versionKey: false, // 2024-08-07~
-    toJSON: {
-        getters: false,
-        virtuals: false,
-        minimize: false,
-        versionKey: false
-    },
-    toObject: {
-        getters: false,
-        virtuals: true,
-        minimize: false,
-        versionKey: false
-    }
-};
-/**
- * 測定スキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
-const indexes = [
-    [
-        { 'project.id': 1 },
-        {
-            name: 'searchByProjectId-v20220721'
-        }
-    ],
-    [
-        { 'object.measuredAt': 1 },
-        {
-            partialFilterExpression: {
-                'object.measuredAt': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'purpose.typeOf': 1, 'object.scope': 1, 'object.measuredAt': 1 },
-        {
-            partialFilterExpression: {
-                'purpose.typeOf': { $exists: true },
-                'object.scope': { $exists: true },
-                'object.measuredAt': { $exists: true }
-            }
-        }
-    ]
-];
-exports.indexes = indexes;

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

@@ -1,9 +0,0 @@
-import type { Connection } from 'mongoose';
-import { IModel } from './mongoose/schemas/telemetry';
-/**
- * 測定リポジトリ
- */
-export declare class TelemetryRepo {
-    readonly telemetryModel: IModel;
-    constructor(connection: Connection);
-}

package/lib/chevre/repo/telemetry.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TelemetryRepo = void 0;
-const telemetry_1 = require("./mongoose/schemas/telemetry");
-/**
- * 測定リポジトリ
- */
-class TelemetryRepo {
-    telemetryModel;
-    constructor(connection) {
-        this.telemetryModel = connection.model(telemetry_1.modelName, (0, telemetry_1.createSchema)());
-    }
-}
-exports.TelemetryRepo = TelemetryRepo;