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

package/example/src/chevre/migrateReservationProvider.ts

@@ -9,7 +9,7 @@ import { chevre } from '../../../lib/index';
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
 
     const reservationRepo = new chevre.repository.Reservation(mongoose.connection);
     const placeRepo = new chevre.repository.Place(mongoose.connection);
@@ -85,9 +85,9 @@ async function main() {
                     'movieTheaterBranchCode:', movieTheaterBranchCode,
                     i
                 );
-                throw new Error('movieTheater not found');
+                // throw new Error('movieTheater not found');
 
-                // return;
+                return;
             }
             if (typeof sellerId === 'string') {
                 const newProvider: chevre.factory.reservation.IProvider = {

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

@@ -37,9 +37,7 @@ export declare class MongoRepository {
     static CREATE_MONGO_CONDITIONS(params: factory.product.ISearchConditions): any[];
     findById(conditions: {
         id: string;
-    }, projection?: {
-        [key: string]: number;
-    }): Promise<IProduct>;
+    }, inclusion: string[], exclusion: string[]): Promise<IProduct>;
     search(conditions: factory.product.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<IProduct[]>;
     deleteById(params: {
         id: string;

package/lib/chevre/repo/product.js

@@ -151,9 +151,30 @@ class MongoRepository {
         }
         return andConditions;
     }
-    findById(conditions, projection) {
+    findById(conditions, 
+    // inclusion化(2023-07-20~)
+    // projection?: { [key: string]: number }
+    inclusion, exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.productModel.findOne({ _id: conditions.id }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const doc = yield this.productModel.findOne({ _id: conditions.id }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.productModel.modelName);

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -175,7 +175,7 @@ function findOffers(params) {
             // 興行設定があれば興行のカタログを参照する(2022-08-31~)
             const eventOffers = params.event.offers;
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
+                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
@@ -209,7 +209,7 @@ function calculateOfferCount(params) {
         try {
             const eventOffers = params.event.offers;
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
+                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const catalogs = yield repos.offerCatalog.search({
                         limit: 1,

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -100,7 +100,7 @@ function findOffers(params) {
             // 興行設定があれば興行のカタログを参照する(2022-08-31~)
             const eventOffers = params.event.offers;
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
+                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },

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

@@ -40,7 +40,7 @@ function start(params) {
             throw new factory.errors.ArgumentNull('object.itemOffered.id');
         }
         // プロダクト確認
-        const product = yield repos.product.findById({ id: productId });
+        const product = yield repos.product.findById({ id: productId }, [], []);
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
             throw new factory.errors.ArgumentNull('transactionNumber');
@@ -124,7 +124,7 @@ function createTransactionObject(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const product = yield repos.product.findById({ id: params.issuedThrough.id });
+        const product = yield repos.product.findById({ id: params.issuedThrough.id }, [], []);
         const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

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

@@ -531,7 +531,7 @@ function validateProgramMembershipUsed(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const product = yield repos.product.findById({ id: params.issuedThrough.id });
+        const product = yield repos.product.findById({ id: params.issuedThrough.id }, ['availableChannel'], []);
         const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

package/lib/chevre/service/moneyTransfer.js

@@ -322,7 +322,7 @@ function getIssuedThroughIdByAction(params) {
 function createPermitServiceCredentials(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const paymentCardService = yield repos.product.findById({ id: params.issuedThrough.id });
+        const paymentCardService = yield repos.product.findById({ id: params.issuedThrough.id }, ['availableChannel'], []);
         const permitServiceEndpoint = (_a = paymentCardService.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
         const permitServiceAuthorizeServerDomain = (_c = (_b = paymentCardService.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
         const permitServiceClientId = (_e = (_d = paymentCardService.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;

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

@@ -18,7 +18,7 @@ function searchTicketOffersByItemOffered(params) {
         var _a, _b, _c, _d;
         let catalogId;
         if (typeof ((_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const eventService = yield repos.product.findById({ id: (_b = params.itemOffered) === null || _b === void 0 ? void 0 : _b.id });
+            const eventService = yield repos.product.findById({ id: (_b = params.itemOffered) === null || _b === void 0 ? void 0 : _b.id }, ['hasOfferCatalog'], []);
             if (typeof ((_c = eventService.hasOfferCatalog) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
                 catalogId = eventService.hasOfferCatalog.id;
             }

package/lib/chevre/service/offer/product/searchProductOffers.js

@@ -18,7 +18,7 @@ function searchProductOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         // プロダクト検索
-        const productWithOffers = yield repos.product.findById({ id: params.itemOffered.id });
+        const productWithOffers = yield repos.product.findById({ id: params.itemOffered.id }, ['hasOfferCatalog'], []);
         const offerCatalogId = (_a = productWithOffers.hasOfferCatalog) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof offerCatalogId !== 'string') {
             return [];

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

@@ -75,9 +75,7 @@ function validatePaymentMethod(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
         }
         // プロダクトから通貨区分を取得
-        const paymentCatdProduct = yield repos.product.findById({
-            id: paymentServiceId
-        });
+        const paymentCatdProduct = yield repos.product.findById({ id: paymentServiceId }, ['serviceOutput'], []);
         const currency = (_e = (_d = paymentCatdProduct.serviceOutput) === null || _d === void 0 ? void 0 : _d.amount) === null || _e === void 0 ? void 0 : _e.currency;
         if (typeof currency !== 'string') {
             throw new factory.errors.NotFound('product.serviceOutput.amount.currency');

package/lib/chevre/service/transaction/orderProgramMembership/findCreditCard.js

@@ -112,7 +112,7 @@ function getCreditCardPaymentServiceChannel(params) {
             throw new factory.errors.NotFound('PaymentService');
         }
         // IDで検索いないとavailableChannelを取得できない
-        const paymentService = yield repos.product.findById({ id: String(paymentServiceSetting.id) });
+        const paymentService = yield repos.product.findById({ id: String(paymentServiceSetting.id) }, ['availableChannel'], []);
         const availableChannel = paymentService === null || paymentService === void 0 ? void 0 : paymentService.availableChannel;
         if (typeof (availableChannel === null || availableChannel === void 0 ? void 0 : availableChannel.serviceUrl) !== 'string') {
             throw new factory.errors.NotFound('paymentService.availableChannel.serviceUrl');

package/package.json

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