@chevre/domain 21.20.0-alpha.19 → 21.20.0-alpha.20

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

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection<T extends factory.transactionType> = keyof factory.transaction.ITransaction<T> | '_id' | '__v' | 'createdAt' | 'updatedAt';
+type IKeyOfProjection<T extends factory.transactionType> = keyof factory.transaction.ITransaction<T> | '_id' | '__v' | 'createdAt' | 'updatedAt' | 'object.orderNumber';
 interface IAggregationByStatus {
     transactionCount: number;
     avgDuration: number;

package/lib/chevre/service/offer/any.js

@@ -44,10 +44,11 @@ function voidAcceptedOffer(params) {
         reservationNumbers = [...new Set(reservationNumbers)];
         debug('removing acceptedOffers from PlaceOrder...', orderNumber, reservationNumbers);
         if (reservationNumbers.length > 0) {
-            yield repos.orderInTransaction.voidAcceptedOfferByReservationNumber({
+            const result = yield repos.orderInTransaction.voidAcceptedOfferByReservationNumber({
                 orderNumber,
                 acceptedOffers: { reservationNumber: { $in: reservationNumbers } }
             });
+            debug('acceptedOffers removed from PlaceOrder.', result);
         }
     });
 }

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

@@ -75,12 +75,14 @@ function authorize(params) {
                     })(repos);
                     acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
                     // add orderInTransaction(2024-01-15~)
-                    if (params.options.useCreateOrderOnOfferAccepted) {
-                        yield (0, any_1.acceptOffer)({
-                            project: transaction.project,
-                            purpose: { id: transaction.id },
-                            acceptedOffers: acceptedOffers4result
-                        })(repos);
+                    if (!noOfferSpecified) {
+                        if (params.options.useCreateOrderOnOfferAccepted) {
+                            yield (0, any_1.acceptOffer)({
+                                project: transaction.project,
+                                purpose: { id: transaction.id },
+                                acceptedOffers: acceptedOffers4result
+                            })(repos);
+                        }
                     }
                     break;
                 default:

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

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
@@ -12,6 +13,7 @@ interface IVoidTransactionRepos {
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
+    orderInTransaction: OrderInTransactionRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
     transaction: TransactionRepo;

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

@@ -15,6 +15,7 @@ const http_status_1 = require("http-status");
 const credentials_1 = require("../../../credentials");
 const factory = require("../../../factory");
 const ReserveTransactionService = require("../../assetTransaction/reserve");
+const any_1 = require("../any");
 const coaAuthClient = new COA.auth.RefreshToken({
     endpoint: credentials_1.credentials.coa.endpoint,
     refreshToken: credentials_1.credentials.coa.refreshToken
@@ -30,7 +31,7 @@ function voidTransaction(params) {
         const transaction = yield repos.transaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id,
-            inclusion: ['_id', 'typeOf', 'status']
+            inclusion: ['_id', 'typeOf', 'status', 'object.orderNumber']
         });
         // 興行オファー承認アクション検索
         let authorizeActions = yield repos.action.searchByPurpose({
@@ -41,9 +42,6 @@ function voidTransaction(params) {
             },
             object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } }
         });
-        // .then((actions) => actions
-        //     .filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation)
-        // );
         switch (transaction.status) {
             case factory.transactionStatusType.InProgress:
                 throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
@@ -59,6 +57,15 @@ function voidTransaction(params) {
             default:
             // no op
         }
+        // add orderInTransaction(2024-01-15~)
+        // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
+        const orderNumberByTransaction = transaction.object.orderNumber;
+        if (typeof orderNumberByTransaction === 'string') {
+            yield (0, any_1.voidAcceptedOffer)({
+                authorizeActions,
+                orderNumber: orderNumberByTransaction
+            })(repos);
+        }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             switch (action.instrument.identifier) {

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

@@ -13,6 +13,7 @@ exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
@@ -27,19 +28,14 @@ function call(data) {
         if (settings.redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection);
-        const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
-        const reservationRepo = new reservation_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
         yield EventOfferService.voidTransaction(data)({
-            action: actionRepo,
-            assetTransaction: assetTransactionRepo,
-            stockHolder: stockHolderRepo,
-            offerRateLimit: offerRateLimitRepo,
-            reservation: reservationRepo,
-            task: taskRepo,
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),
+            offerRateLimit: new offer_1.RedisRepository(settings.redisClient),
+            orderInTransaction: new orderInTransaction_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.19"
+  "version": "21.20.0-alpha.20"
 }