@chevre/domain 21.8.0-alpha.9 → 21.8.0

package/example/src/chevre/searchOffers.ts

@@ -9,10 +9,13 @@ async function main() {
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
 
     const offers = await offerRepo.search({
-        limit: 1,
+        limit: 100,
         // page: 1,
         project: { id: { $eq: String(process.env.PROJECT_ID) } },
-        availability: { $eq: chevre.factory.itemAvailability.InStock }
+        availability: { $eq: chevre.factory.itemAvailability.InStock },
+        parentOffer: {
+        },
+        includedInDataCatalog: { id: { $in: ['0001'] } }
         // additionalProperty: {
         //     $all: [
         //         {

package/example/src/chevre/searchOffersByCatalog.ts

@@ -5,22 +5,28 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
 
-    const { offers } = await offerRepo.findOffersByOfferCatalogId({
-        ids: ['al96nqj7z', 'xxx', '1001'],
-        // ids: ['xx', 'xxx'],
-        offerCatalog: {
-            id: '0001'
-            // id: 'xxx'
+    const { offers, sortedOfferIds } = await offerRepo.searchByOfferCatalogIdWithSortIndex({
+        limit: 10,
+        page: 1,
+        // ids: ['xx', 'xxx', '1001', '901'],
+        subOfferCatalog: {
+            id: 'xxx'
         },
         excludeAppliesToMovieTicket: false,
-        sort: true
+        useIncludeInDataCatalog: true
     });
-    console.log(offers.map((o) => o.id));
+    // console.log(offers);
+    console.log(offers.map((offer) => {
+        const sortIndex = sortedOfferIds.findIndex((s) => s === offer.id);
+
+        return `${offer.project?.id} ${offer.identifier} ${offer.priceSpecification?.price} ${offer.name?.ja} ${offer.id} ${offer.offerIndex} ${sortIndex}`;
+    }));
     console.log(offers.length);
+    console.log('USE_AGGREGATE_OFFERS_AS_PRIMARY:', process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY);
 }
 
 main()

package/example/src/chevre/searchOffersFromAggregateOffer.ts

@@ -0,0 +1,168 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+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 });
+
+    const offerRepo = new chevre.repository.Offer(mongoose.connection);
+
+    const offers = await offerRepo.search(
+        {
+            limit: 10,
+            page: 1,
+            sort: {
+                'priceSpecification.price': 1,
+                identifier: 1
+            },
+            project: { id: { $eq: String(process.env.PROJECT_ID) } },
+            availability: { $eq: chevre.factory.itemAvailability.InStock },
+            itemOffered: {
+                typeOf: {
+                    // $eq: chevre.factory.product.ProductType.EventService
+                }
+            },
+            addOn: {
+                itemOffered: {
+                    /**
+                     * アドオンプロダクトID
+                     */
+                    id: {
+                        // $eq: ''
+                    }
+                }
+            },
+            availableAtOrFrom: {
+                id: {
+                    // $eq: ''
+                    // $in: string[]
+                }
+            },
+            eligibleMembershipType: {
+                /**
+                 * 適用メンバーシップ区分
+                 */
+                codeValue: {
+                    // $eq: 'Permit'
+                }
+            },
+            eligibleMonetaryAmount: {
+                /**
+                 * 適用通貨区分
+                 */
+                currency: {
+                    // $eq: 'Point'
+                }
+            },
+            eligibleSeatingType: {
+                /**
+                 * 適用座席区分
+                 */
+                codeValue: {
+                    // $eq: ''
+                }
+            },
+            hasMerchantReturnPolicy: {
+                id: {
+                    // $eq: ''
+                }
+            },
+            // parentOffer: { id: { $in: ['901'] } },
+            id: {
+                // $eq: '901'
+                // $in: string[];
+            },
+            identifier: {
+                // $eq: '1001'
+                // $in: string[];
+                // $regex: '003'
+            },
+            name: {
+                // $regex: ''
+            },
+            priceSpecification: {
+                appliesToMovieTicket: {
+                    /**
+                     * 適用決済カード区分
+                     */
+                    serviceType: {
+                        /**
+                         * 適用決済カード区分が存在するかどうか
+                         */
+                        // $exists: boolean;
+                        // $eq: '01'
+                    },
+                    serviceOutput: {
+                        /**
+                         * 適用決済方法タイプ
+                         */
+                        typeOf: {
+                            // $eq: ''
+                            // $nin: string[];
+                        }
+                    }
+                },
+                price: {
+                    // $gte: 2000,
+                    // $lte: 2000
+                },
+                referenceQuantity: {
+                    value: {
+                        // $eq: 2
+                    }
+                },
+                accounting: {
+                    accountsReceivable: {
+                        // $gte: 1800,
+                        // $lte: 100
+                    },
+                    operatingRevenue: {
+                        codeValue: {
+                            // $eq: ''
+                            // $in: string[];
+                        }
+                    }
+                }
+            },
+            category: {
+                codeValue: {
+                    // $in: ['1']
+                }
+            }
+            /**
+             * 有効期間設定がない、あるいは、有効期間内
+             */
+            // onlyValid: true
+            // additionalProperty: {
+            //     $all: [
+            //         {
+            //             $elemMatch: {
+            //                 name: { $eq: 'nameForPrinting' },
+            //                 value: { $in: ['General'] }
+            //             }
+            //         }
+            //     ]
+            // }
+        },
+        {
+            id: 1,
+            identifier: 1,
+            name: 1,
+            alternateName: 1,
+            priceSpecification: 1,
+            project: 1
+        }
+    );
+    console.log(offers);
+    console.log(offers.map((offer) => {
+        return `${offer.project?.id} ${offer.identifier} ${offer.priceSpecification?.price} ${offer.name?.ja} ${offer.id}`;
+    }));
+    console.log(offers.length);
+    console.log('USE_AGGREGATE_OFFERS_AS_PRIMARY:', process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/searchOrders.ts

@@ -6,11 +6,12 @@ import { chevre } from '../../../lib/index';
 const project = { id: String(process.env.PROJECT_ID) };
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
 
     const orderRepo = new chevre.repository.Order(mongoose.connection);
 
     const orders = await orderRepo.search({
+        limit: 10,
         project: { id: { $eq: project.id } },
         // acceptedOffers: {
         //     itemOffered: {
@@ -18,12 +19,13 @@ async function main() {
         //     }
         // },
         paymentMethods: {
-            additionalProperty: {
-                $in: [
-                    { name: 'orderId', value: '0102022031518442020' },
-                    { name: 'orderId', value: '0102022031518423030' }
-                ]
-            }
+            paymentMethod: { identifier: { $in: ['Cash'] } }
+            // additionalProperty: {
+            //     $in: [
+            //         { name: 'orderId', value: '0102022031518442020' },
+            //         { name: 'orderId', value: '0102022031518423030' }
+            //     ]
+            // }
         }
     });
     console.log('orders found', orders);

package/example/src/chevre/syncCatalogs2aggregateOffers.ts

@@ -0,0 +1,85 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    const now = new Date();
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+
+    const offerRepo = new chevre.repository.Offer(mongoose.connection);
+    const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+
+    const cursor = offerCatalogRepo.getCursor(
+        {
+            // 'project.id': { $eq: project.id }
+        },
+        {
+            __v: 0,
+            createdAt: 0,
+            updatedAt: 0
+        }
+    );
+    console.log('catalogs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const { _id, ...offerCatalog } = <chevre.factory.offerCatalog.IOfferCatalog & { _id: string }>doc.toObject();
+        const aggregateOfferIds = offerCatalog.itemListElement.map((element) => element.id);
+
+        // 記載カタログの追加された単価オファーの存在を検証
+        const existingOffers = await offerRepo.search(
+            {
+                project: { id: { $eq: offerCatalog.project.id } },
+                // parentOffer: {},
+                includedInDataCatalog: { id: { $in: [String(offerCatalog.id)] } }
+            },
+            { id: 1 }
+        );
+        console.log(existingOffers.length, 'offers found', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
+        const alreadyMigrated = aggregateOfferIds.length === existingOffers.length;
+
+        if (alreadyMigrated) {
+            console.log('already synced.', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
+        } else {
+            console.log('creating task...', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
+            const syncTaskData: chevre.factory.task.onResourceUpdated.IData4common = {
+                typeOf: 'OfferCatalog',
+                id: [String(offerCatalog.id)],
+                isNew: false,
+                isDeleted: false,
+                project: { id: offerCatalog.project.id },
+                useInform: false
+            };
+            const syncTask: chevre.factory.task.IAttributes<chevre.factory.taskName.OnResourceUpdated> = {
+                data: syncTaskData,
+                executionResults: [],
+                name: chevre.factory.taskName.OnResourceUpdated,
+                numberOfTried: 0,
+                project: offerCatalog.project,
+                remainingNumberOfTries: 1,
+                runsAt: now,
+                status: chevre.factory.taskStatus.Ready
+            };
+            await taskRepo.saveMany([syncTask], { emitImmediately: false });
+            updateCount += 1;
+            console.log('task saved.', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
+        }
+    });
+
+    console.log(i, 'catalogs checked');
+    console.log(updateCount, 'catalogs synced');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/emailMessageBuilder.js

@@ -107,7 +107,7 @@ function createEmailMessageAbout(params) {
     });
 }
 function createEmailMessageSender(params) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     return {
         typeOf: params.order.seller.typeOf,
         name: (typeof ((_b = (_a = params.email) === null || _a === void 0 ? void 0 : _a.sender) === null || _b === void 0 ? void 0 : _b.name) === 'string')
@@ -115,10 +115,11 @@ function createEmailMessageSender(params) {
             : (typeof params.order.seller.name === 'string')
                 ? params.order.seller.name
                 : String(params.order.seller.id),
-        // sender.email指定を非推奨化(2023-08-23~)
-        email: (settings_1.USE_CUSTOM_SENDER_EMAIL && typeof ((_d = (_c = params.email) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email) === 'string')
-            ? params.email.sender.email
-            : settings_1.DEFAULT_SENDER_EMAIL
+        // sender.email指定を廃止(2023-09-07~)
+        // email: (USE_CUSTOM_SENDER_EMAIL && typeof params.email?.sender?.email === 'string')
+        //     ? params.email.sender.email
+        //     : DEFAULT_SENDER_EMAIL
+        email: settings_1.DEFAULT_SENDER_EMAIL
     };
 }
 /**

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

@@ -0,0 +1,62 @@
+import { AnyExpression, Connection, PipelineStage } from 'mongoose';
+import * as factory from '../factory';
+type IMatchStage = PipelineStage.Match;
+type KeyOfUnitPriceOffer = keyof factory.unitPriceOffer.IUnitPriceOffer;
+type IProjection = {
+    [key in KeyOfUnitPriceOffer]?: 0 | 1;
+};
+export type IUnitPriceOfferFromAggregateOffer = factory.unitPriceOffer.IUnitPriceOffer & {
+    offerIndex?: number;
+    parentOffer?: {
+        id: string;
+    };
+};
+/**
+ * 集計オファーリポジトリ
+ */
+export declare class MongoRepository {
+    private readonly aggregateOfferModel;
+    constructor(connection: Connection);
+    static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params: factory.unitPriceOffer.ISearchConditions): IMatchStage[];
+    static CREATE_AGGREGATE_OFFERS_PROJECTION(params: IProjection): {
+        [field: string]: AnyExpression;
+    };
+    count(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
+    search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<factory.aggregateOffer.IAggregateOffer[]>;
+    pushIncludedInDataCatalog(params: {
+        project: {
+            id: string;
+        };
+        id: {
+            $in: string[];
+        };
+        $push: {
+            includedInDataCatalog: {
+                $each: {
+                    id: string;
+                }[];
+            };
+        };
+    }): Promise<void>;
+    /**
+     * 記載カタログからカタログを除外する
+     */
+    pullIncludedInDataCatalog(params: {
+        project: {
+            id: string;
+        };
+        id?: {
+            $nin?: string[];
+        };
+        $pull: {
+            includedInDataCatalog: {
+                $elemMatch: {
+                    id: {
+                        $eq: string;
+                    };
+                };
+            };
+        };
+    }): Promise<void>;
+}
+export {};