@chevre/domain 20.4.0-alpha.17 → 20.4.0-alpha.19

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

@@ -1,5 +1,8 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
+interface IProjection {
+    [key: string]: 0;
+}
 /**
  * オファーリポジトリ
  */
@@ -29,6 +32,7 @@ export declare class MongoRepository {
         limit?: number;
         page?: number;
         sort: boolean;
+        projection?: IProjection;
     }): Promise<{
         offers: factory.unitPriceOffer.IUnitPriceOffer[];
         sortedOfferIds: string[];
@@ -37,7 +41,7 @@ export declare class MongoRepository {
         id: string;
     }): Promise<factory.unitPriceOffer.IUnitPriceOffer>;
     count(params: factory.unitPriceOffer.ISearchConditions): Promise<number>;
-    search(params: factory.unitPriceOffer.ISearchConditions): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
+    search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
     save(params: factory.unitPriceOffer.IUnitPriceOffer): Promise<factory.unitPriceOffer.IUnitPriceOffer>;
     saveManyByIdentifier(params: {
         attributes: factory.unitPriceOffer.IUnitPriceOffer;
@@ -53,3 +57,4 @@ export declare class MongoRepository {
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
 }
+export {};

package/lib/chevre/repo/offer.js

@@ -373,7 +373,7 @@ class MongoRepository {
                     }, onlyValid: params.onlyValid === true }), (typeof params.limit === 'number' && typeof params.page === 'number')
                     ? { sort: { _id: factory.sortType.Ascending } }
                     : undefined), (typeof params.limit === 'number') ? { limit: params.limit } : undefined), (typeof params.page === 'number') ? { page: params.page } : undefined);
-                offers = yield this.search(searchOffersConditions);
+                offers = yield this.search(searchOffersConditions, params.projection);
                 if (params.sort) {
                     // sorting
                     offers = offers.sort((a, b) => sortedOfferIds.indexOf(String(a.id)) - sortedOfferIds.indexOf(String(b.id)));
@@ -404,14 +404,10 @@ class MongoRepository {
                 .exec();
         });
     }
-    search(params) {
+    search(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_OFFER_MONGO_CONDITIONS(params);
-            const query = this.offerModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            });
+            const query = this.offerModel.find((conditions.length > 0) ? { $and: conditions } : {}, Object.assign(Object.assign({}, projection), { __v: 0, createdAt: 0, updatedAt: 0 }));
             if (typeof params.limit === 'number') {
                 const page = (typeof params.page === 'number') ? params.page : 1;
                 query.limit(params.limit)

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

@@ -294,7 +294,7 @@ function coaTicket2offer(params) {
     const eligibleMembershipType = (params.ticketResult.flgMember === COA.factory.master.FlgMember.Member
         && typeof ((_b = params.defaultMembershipType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
         ? [{
-                project: params.defaultMembershipType.project,
+                // project: params.defaultMembershipType.project,
                 typeOf: params.defaultMembershipType.typeOf,
                 id: params.defaultMembershipType.id,
                 codeValue: params.defaultMembershipType.codeValue,

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

@@ -13,9 +13,7 @@ interface ISearchEventTicketOffersRepos {
 }
 declare type ISearchEventTicketOffersOperation<T> = (repos: ISearchEventTicketOffersRepos) => Promise<T>;
 declare type IAcceptedPaymentMethod = factory.paymentMethod.paymentCard.movieTicket.IMovieTicket;
-declare type ITicketOfferWithSortIndex = factory.product.ITicketOffer & {
-    sortIndex?: number;
-};
+declare type ITicketOfferWithSortIndex = factory.product.ITicketOffer;
 /**
  * 興行オファー検索
  */

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

@@ -97,10 +97,17 @@ exports.invalidatePaymentUrl = invalidatePaymentUrl;
  */
 function processVoidPayTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findById({
-            typeOf: params.purpose.typeOf,
-            id: params.purpose.id
-        });
+        let transaction;
+        // アクションID指定の場合、進行中取引検証(2023-02-24~)
+        if (typeof params.id === 'string') {
+            transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
+        }
+        else {
+            transaction = yield repos.transaction.findById({
+                typeOf: params.purpose.typeOf,
+                id: params.purpose.id
+            });
+        }
         // 承認アクションを取得
         let authorizeActions;
         if (typeof params.id === 'string') {

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.289.0-alpha.14",
-    "@cinerino/sdk": "3.140.0-alpha.15",
+    "@chevre/factory": "4.289.0-alpha.15",
+    "@cinerino/sdk": "3.140.0-alpha.16",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.17"
+  "version": "20.4.0-alpha.19"
 }