@chevre/domain 21.22.0-alpha.2 → 21.22.0

package/example/src/chevre/migrateProjectMakesOffer.ts

@@ -8,6 +8,8 @@ enum ROLE_NAME {
     Customer = 'customer',
     POS = 'pos'
 }
+const CLIENT_ID = '5glmsqlnlmbri3bgruddoe78lb';
+const CUSTOMER_TYPE = 'POS';
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
@@ -18,8 +20,8 @@ async function main() {
 
     const cursor = memberRepo.getCursor(
         {
-            'member.hasRole.roleName': { $in: [ROLE_NAME.Customer, ROLE_NAME.POS] }
-            // 'member.id': { $eq: '3eo6okferrsdpfd9j2ce1iv9k7' }
+            'member.hasRole.roleName': { $in: [ROLE_NAME.Customer, ROLE_NAME.POS] },
+            'member.id': { $eq: CLIENT_ID }
         },
         {
             // _id: 1,
@@ -37,7 +39,10 @@ async function main() {
             offeredBy: { id: { $eq: iamMember.project.id } },
             availableAtOrFrom: { id: { $eq: iamMember.member.id } }
         });
-        const alreadyMigrated = existingOffers.length === 1;
+        const alreadyMigrated = existingOffers.length === 1
+            && Array.isArray(existingOffers[0].eligibleCustomerType)
+            && existingOffers[0].eligibleCustomerType.length === 1
+            && existingOffers[0].eligibleCustomerType[0].codeValue === CUSTOMER_TYPE;
 
         if (alreadyMigrated) {
             console.log(
@@ -46,8 +51,11 @@ async function main() {
             console.log(
                 'updating project...',
                 iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, iamMember.member.name, i);
-            await makesOfferRepo.create({
+            await makesOfferRepo.updateOne({
                 availableAtOrFrom: { id: iamMember.member.id },
+                eligibleCustomerType: [{
+                    codeValue: CUSTOMER_TYPE
+                }],
                 offeredBy: { id: iamMember.project.id }
             });
             updateCount += 1;

package/example/src/chevre/searchAvaialbleAppliesToMovieTicketByOfferCatalogId.ts

@@ -15,11 +15,10 @@ async function main() {
         limit: 10,
         page: 1,
         subOfferCatalog: {
-            id: '0001',
-            isOfferCatalogItem: false
+            id: '0001'
+            // isOfferCatalogItem: false
         },
         excludeAppliesToMovieTicket: false,
-        useIncludeInDataCatalog: true,
         unacceptedPaymentMethod: []
     });
     console.log(result);
@@ -28,7 +27,6 @@ async function main() {
     result = await (await chevre.service.offer.createService()).event.searchOfferAppliesToMovieTicket({
         event: { id: 'cllkq475p' },
         onlyValid: true,
-        useIncludeInDataCatalog: true,
         limit: 100,
         page: 1
         // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined

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

@@ -146,14 +146,12 @@ export declare class MongoRepository {
              * サブカタログID
              */
             id: string;
-            isOfferCatalogItem: boolean;
         };
         availableAtOrFrom?: {
             id?: string;
         };
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
-        useIncludeInDataCatalog: boolean;
         onlyValid?: boolean;
         limit?: number;
         page?: number;

package/lib/chevre/repo/offer.js

@@ -622,17 +622,19 @@ class MongoRepository {
     searchAvaialbleAppliesToMovieTicketByOfferCatalogId(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let sortedOfferIds = [];
-            if (!params.useIncludeInDataCatalog) {
-                // useIncludeInDataCatalogでない場合のみ集計オファーIDリストを検索する
-                sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
-                    id: params.subOfferCatalog.id,
-                    isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem
-                });
-            }
-            const searchOffersConditions = Object.assign(Object.assign(Object.assign({}, (params.useIncludeInDataCatalog)
-                ? { includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } }
-                : { parentOffer: { id: { $in: sortedOfferIds } } }), (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+            // let sortedOfferIds: string[] = [];
+            // if (!params.useIncludeInDataCatalog) {
+            //     // useIncludeInDataCatalogでない場合のみ集計オファーIDリストを検索する
+            //     sortedOfferIds = await this.searchAggregateOfferIdsBySubOfferCatalog({
+            //         id: params.subOfferCatalog.id,
+            //         isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem
+            //     });
+            // }
+            const searchOffersConditions = Object.assign(Object.assign({ 
+                // ...(params.useIncludeInDataCatalog)
+                //     ? { includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } }
+                //     : { parentOffer: { id: { $in: sortedOfferIds } } },
+                includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                 ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } }
                 : undefined), { priceSpecification: {
                     appliesToMovieTicket: Object.assign({ 

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

@@ -76,7 +76,6 @@ declare function searchOfferAppliesToMovieTicket(params: {
      * 有効なオファーのみ対象とするか
      */
     onlyValid?: boolean;
-    useIncludeInDataCatalog: boolean;
 }): (repos: {
     event: EventRepo;
     offer: OfferRepo;

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

@@ -397,19 +397,20 @@ function searchOfferAppliesToMovieTicket(params) {
         }
         // サブカタログIDを決定
         let subOfferCatalogId = catalogId;
-        let isOfferCatalogItem = false;
+        // let isOfferCatalogItem: boolean = false;
         const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
         if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
             subOfferCatalogId = offerCatalogFirstElement.id;
-            isOfferCatalogItem = true;
+            // isOfferCatalogItem = true;
         }
         return repos.offer.searchAvaialbleAppliesToMovieTicketByOfferCatalogId({
-            subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
+            // subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
+            subOfferCatalog: { id: subOfferCatalogId },
             availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
             unacceptedPaymentMethod: unacceptedPaymentMethod,
             excludeAppliesToMovieTicket: excludeAppliesToMovieTicket,
             onlyValid: params.onlyValid === true,
-            useIncludeInDataCatalog: params.useIncludeInDataCatalog,
+            // useIncludeInDataCatalog: params.useIncludeInDataCatalog,
             limit: params.limit,
             page: params.page
         });

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.22.0-alpha.2"
+  "version": "21.22.0"
 }