@chevre/domain 21.28.0-alpha.7 → 21.28.0-alpha.9

package/lib/chevre/repo/event.js

@@ -477,10 +477,11 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             let docs;
+            const insertingDocs = params.attributes.map((p) => {
+                return Object.assign({ _id: uniqid() }, p);
+            });
             try {
-                docs = yield this.eventModel.insertMany(params.attributes.map((p) => {
-                    return Object.assign({ _id: uniqid() }, p);
-                }));
+                docs = yield this.eventModel.insertMany(insertingDocs);
             }
             catch (error) {
                 if (yield (0, errorHandler_1.isMongoError)(error)) {

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

@@ -64,9 +64,6 @@ export declare function createReservation(params: {
         typeOf: factory.organizationType.Project;
     };
     id: string;
-    reserveDate: Date;
-    agent: factory.assetTransaction.reserve.IAgent;
-    reservationNumber: string;
     reservationFor: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
     reservedTicket: factory.reservation.ITicket;
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];

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

@@ -121,11 +121,7 @@ function createReservedTicket(params) {
     const ticketType = createTicketType({ availableOffer: params.availableOffer });
     const issuedBy = createIssuedBy({ acceptedOffer: params.acceptedOffer, availableOffer: params.availableOffer });
     return Object.assign({ dateIssued: params.dateIssued, issuedBy,
-        // 不要なので廃止(2022-12-19~)
-        // priceCurrency: factory.priceCurrency.JPY,
-        ticketType, typeOf: 'Ticket' }, (ticketedSeat !== undefined)
-        ? { ticketedSeat: ticketedSeat }
-        : {});
+        ticketType, typeOf: 'Ticket' }, (ticketedSeat !== undefined) ? { ticketedSeat } : {});
 }
 exports.createReservedTicket = createReservedTicket;
 /**
@@ -416,18 +412,19 @@ function createReservation(params) {
     // priceを最適化
     const price4reservation = (0, price_1.createPrice)(params);
     if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
-        return Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, 
+        return Object.assign(Object.assign(Object.assign({ 
+            // project: params.project, // 廃止(2024-04-08~)
+            typeOf: factory.reservationType.EventReservation, id: params.id, 
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
-            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, 
+            additionalProperty: params.additionalProperty, 
+            // bookingTime: params.reserveDate, // 廃止(2024-04-08~)
+            // modifiedTime: params.reserveDate, // 廃止(2024-04-08~)
+            numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, 
+            // reservationNumber: params.reservationNumber, // 廃止(2024-04-08~)
             // statusは不要なので削除(2023-07-19~)
             // reservationStatus: factory.reservationStatusType.ReservationPending,
-            reservedTicket: params.reservedTicket, 
-            // 最適化(2022-12-19~)
-            underName: {
-                typeOf: params.agent.typeOf,
-                name: params.agent.name
-            }, checkedIn: false, attended: false }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))
+            reservedTicket: params.reservedTicket }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))
             ? {
                 subReservation: params.subReservation.map((r) => {
                     return {
@@ -443,16 +440,19 @@ function createReservation(params) {
             : undefined);
     }
     else {
-        return Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.BusReservation, id: params.id, 
+        return Object.assign(Object.assign(Object.assign({ 
+            // project: params.project,
+            typeOf: factory.reservationType.BusReservation, id: params.id, 
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
-            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, 
+            additionalProperty: params.additionalProperty, 
+            // bookingTime: params.reserveDate,
+            // modifiedTime: params.reserveDate,
+            numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, 
+            // reservationNumber: params.reservationNumber,
             // statusは不要なので削除(2023-07-19~)
             // reservationStatus: factory.reservationStatusType.ReservationPending,
-            reservedTicket: params.reservedTicket, underName: {
-                typeOf: params.agent.typeOf,
-                name: params.agent.name
-            }, checkedIn: false, attended: false }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))
+            reservedTicket: params.reservedTicket }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))
             ? {
                 subReservation: params.subReservation.map((r) => {
                     return {

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

@@ -467,10 +467,10 @@ function createReservations4transactionObject(params) {
             reservations.push((0, factory_1.createReservation)({
                 project: params.transaction.project,
                 id: reservationId,
-                reserveDate: params.now,
-                agent: params.transaction.agent,
+                // reserveDate: params.now,
+                // agent: params.transaction.agent,
                 // broker: params.transaction.object.broker,
-                reservationNumber: reservationNumber,
+                // reservationNumber: reservationNumber,
                 reservationFor: params.event,
                 reservedTicket: reservedTicket,
                 additionalProperty: additionalProperty,

package/lib/chevre/service/payment/creditCard.d.ts

@@ -82,6 +82,10 @@ declare function getGMOInfoFromSeller(params: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
 }) => Promise<IGMOInfo>;
+/**
+ * 決済代行側の取引状態参照
+ * 存在しない場合NotFoundエラー
+ */
 declare function searchGMOTrade(params: {
     availableChannel: factory.product.IAvailableChannel;
     paymentMethodId: string;

package/lib/chevre/service/payment/creditCard.js

@@ -167,6 +167,10 @@ function processAuthorizeCreditCard3ds(params) {
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult, secureTran2Result };
     });
 }
+var GMOErrorInfo;
+(function (GMOErrorInfo) {
+    GMOErrorInfo["TransactionNotFound"] = "E01110002";
+})(GMOErrorInfo || (GMOErrorInfo = {}));
 function handleAuthorizeError(error) {
     debug('handling creditCard authorizeError:', error);
     let handledError = error;
@@ -263,7 +267,7 @@ function voidTransaction(params) {
                 if (Array.isArray(error.errors) && error.errors.length > 0) {
                     const gmoErrors = error.errors;
                     // 指定されたIDとパスワードの取引が存在しません。
-                    const notFoundErrorExists = gmoErrors.some(({ info }) => info === 'E01110002');
+                    const notFoundErrorExists = gmoErrors.some(({ info }) => info === GMOErrorInfo.TransactionNotFound);
                     if (notFoundErrorExists) {
                         throwsError = false;
                     }
@@ -576,6 +580,10 @@ function getGMOInfoFromSeller(params) {
     });
 }
 exports.getGMOInfoFromSeller = getGMOInfoFromSeller;
+/**
+ * 決済代行側の取引状態参照
+ * 存在しない場合NotFoundエラー
+ */
 function searchGMOTrade(params) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
@@ -584,15 +592,36 @@ function searchGMOTrade(params) {
             useFetch: credentials_1.credentials.gmo.useFetch
         }, { timeout: credentials_1.credentials.gmo.timeout });
         // 取引状態参照
-        debug('searching trade...', params.paymentMethodId);
-        const searchTradeResult = yield creditCardService.searchTrade({
-            shopId: params.shopId,
-            shopPass: params.shopPass,
-            orderId: params.paymentMethodId,
-            siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
-            sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
-        });
-        debug('searchTradeResult is', searchTradeResult);
+        let searchTradeResult;
+        try {
+            searchTradeResult = yield creditCardService.searchTrade({
+                shopId: params.shopId,
+                shopPass: params.shopPass,
+                orderId: params.paymentMethodId,
+                siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
+                sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
+            });
+        }
+        catch (error) {
+            // searchTradeでのエラーをハンドリング(2024-04-08~)
+            let throwsError = true;
+            if (error.name === 'GMOServiceBadRequestError') {
+                if (Array.isArray(error.errors) && error.errors.length > 0) {
+                    const gmoErrors = error.errors;
+                    // 指定されたIDとパスワードの取引が存在しません。
+                    const notFoundErrorExists = gmoErrors.some(({ info }) => info === GMOErrorInfo.TransactionNotFound);
+                    if (notFoundErrorExists) {
+                        throwsError = false;
+                    }
+                }
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+        if (searchTradeResult === undefined) {
+            throw new factory.errors.NotFound('searchTradeResult');
+        }
         return searchTradeResult;
     });
 }

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.366.0-alpha.0",
+    "@chevre/factory": "4.366.0-alpha.1",
     "@cinerino/sdk": "5.17.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.28.0-alpha.7"
+  "version": "21.28.0-alpha.9"
 }