@chevre/domain 20.4.0-alpha.30 → 20.4.0-alpha.32

package/example/src/chevre/{deleteReservationTicketUnderNames.ts → deleteTasksByName.ts}

@@ -8,9 +8,11 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
-    const reservationRepo = new chevre.repository.Reservation(mongoose.connection);
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
 
-    const result = await reservationRepo.deleteReservedTicketUnderName();
+    const result = await taskRepo.deleteByName({
+        name: <any>'DeleteAuthorization'
+    });
 
     console.log('deleted', result);
 }

package/example/src/chevre/searchEventTicketOffers.ts

@@ -24,7 +24,6 @@ async function main() {
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
         event: { id: 'ale6qiedi' },
         onlyValid: true,
-        sort: false,
         validateOfferRateLimit: true,
         addSortIndex: true,
         limit: 100,

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

@@ -55,6 +55,14 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
+    deleteByName(params: {
+        name: factory.taskName;
+    }): Promise<{
+        ok?: number | undefined;
+        n?: number | undefined;
+    } & {
+        deletedCount?: number | undefined;
+    }>;
     aggregateTask(params: {
         project?: {
             id?: {

package/lib/chevre/repo/task.js

@@ -310,6 +310,14 @@ class MongoRepository {
                 .exec();
         });
     }
+    deleteByName(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.taskModel.deleteMany({
+                name: { $eq: params.name }
+            })
+                .exec();
+        });
+    }
     aggregateTask(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

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

@@ -94,8 +94,10 @@ function createTransactionObject(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // オファー検索
         const offers = yield (0, searchProductOffers_1.searchProductOffers)({
+            ids: params.acceptedOffers.map((o) => o.id),
             itemOffered: { id: String(params.product.id) },
-            sort: false // ソート不要(2023-01-27~)
+            onlyValid: true,
+            addSortIndex: false
         })(repos);
         const transactionObject = [];
         for (const acceptedOffer of params.acceptedOffers) {

package/lib/chevre/service/offer/product/searchProductOffers.d.ts

@@ -5,10 +5,20 @@ import { MongoRepository as ProductRepo } from '../../../repo/product';
  * プロダクトオファーを検索する
  */
 export declare function searchProductOffers(params: {
+    /**
+     * 指定したIDのオファーだけ取得する場合
+     */
+    ids?: string[];
     itemOffered: {
         id: string;
     };
-    sort: boolean;
+    availableAt?: {
+        id: string;
+    };
+    onlyValid: boolean;
+    addSortIndex: boolean;
+    limit?: number;
+    page?: number;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;

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

@@ -23,16 +23,23 @@ function searchProductOffers(params) {
         if (typeof offerCatalogId !== 'string') {
             return [];
         }
-        const { offers } = yield repos.offer.findOffersByOfferCatalogId({
+        const { offers, sortedOfferIds } = yield repos.offer.findOffersByOfferCatalogId({
+            ids: params.ids,
             offerCatalog: { id: offerCatalogId },
             excludeAppliesToMovieTicket: false,
-            sort: params.sort
+            limit: params.limit,
+            page: params.page,
+            sort: false,
+            onlyValid: params.onlyValid === true,
+            availableAtOrFrom: params.availableAt
         });
         return offers.map((o) => {
+            let sortIndex;
+            if (params.addSortIndex) {
+                sortIndex = sortedOfferIds.indexOf(String(o.id));
+            }
             const unitSpec = o.priceSpecification;
             const compoundPriceSpecification = {
-                // 不要な属性を除外(2022-11-02~)
-                // project: productWithOffers.project,
                 typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
                 priceCurrency: factory.priceCurrency.JPY,
                 valueAddedTaxIncluded: true,
@@ -40,10 +47,7 @@ function searchProductOffers(params) {
                     ...(unitSpec !== undefined) ? [unitSpec] : []
                 ]
             };
-            return Object.assign(Object.assign({ additionalProperty: (Array.isArray(o.additionalProperty)) ? o.additionalProperty : [], alternateName: o.alternateName, availability: o.availability, availableAtOrFrom: o.availableAtOrFrom, color: o.color, description: o.description, id: o.id, identifier: o.identifier, itemOffered: o.itemOffered, name: o.name, priceCurrency: o.priceCurrency, 
-                // 不要な属性を除外(2022-11-07~)
-                // project: o.project,
-                typeOf: o.typeOf, priceSpecification: compoundPriceSpecification }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined);
+            return Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray(o.additionalProperty)) ? o.additionalProperty : [], alternateName: o.alternateName, availability: o.availability, availableAtOrFrom: o.availableAtOrFrom, color: o.color, description: o.description, id: o.id, identifier: o.identifier, itemOffered: o.itemOffered, name: o.name, priceCurrency: o.priceCurrency, typeOf: o.typeOf, priceSpecification: compoundPriceSpecification }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined), (typeof sortIndex === 'number') ? { sortIndex } : undefined);
         });
     });
 }

package/lib/chevre/service/offer/product.d.ts

@@ -37,6 +37,10 @@ export { searchProductOffers };
  * プロダクトオファーを検索する
  */
 export declare function search(params: {
+    /**
+     * 指定したIDのオファーだけ取得する場合
+     */
+    ids?: string[];
     project: {
         id: string;
     };
@@ -50,7 +54,9 @@ export declare function search(params: {
         id: string;
     };
     onlyValid: boolean;
-    sort: boolean;
+    limit?: number;
+    page?: number;
+    addSortIndex: boolean;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;

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

@@ -25,9 +25,8 @@ exports.ERROR_MESSAGE_ALREADY_REGISTERED = 'Already registered';
  */
 function search(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         const now = moment();
-        let offers = [];
         const searchProductsResult = yield repos.product.search({
             limit: 1,
             page: 1,
@@ -39,54 +38,63 @@ function search(params) {
             throw new factory.errors.NotFound('Product');
         }
         // 販売者指定の場合、検証
-        if (typeof ((_a = params.seller) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const productOffers = product.offers;
-            if (!Array.isArray(productOffers)) {
-                return offers;
-            }
-            const hasValidOffer = productOffers.some((o) => {
-                var _a, _b;
-                return ((_a = o.seller) === null || _a === void 0 ? void 0 : _a.id) === ((_b = params.seller) === null || _b === void 0 ? void 0 : _b.id)
-                    && o.validFrom !== undefined
-                    && moment(o.validFrom)
-                        .isSameOrBefore(now)
-                    && o.validThrough !== undefined
-                    && moment(o.validThrough)
-                        .isSameOrAfter(now);
-            });
-            if (!hasValidOffer) {
-                return offers;
+        if (product.typeOf === factory.product.ProductType.MembershipService
+            || product.typeOf === factory.product.ProductType.PaymentCard) {
+            if (typeof ((_a = params.seller) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+                const productOffers = product.offers;
+                if (!Array.isArray(productOffers)) {
+                    return [];
+                }
+                const hasValidOffer = productOffers.some((o) => {
+                    var _a, _b;
+                    return ((_a = o.seller) === null || _a === void 0 ? void 0 : _a.id) === ((_b = params.seller) === null || _b === void 0 ? void 0 : _b.id)
+                        && o.validFrom !== undefined
+                        && moment(o.validFrom)
+                            .isSameOrBefore(now)
+                        && o.validThrough !== undefined
+                        && moment(o.validThrough)
+                            .isSameOrAfter(now);
+                });
+                if (!hasValidOffer) {
+                    return [];
+                }
             }
         }
-        offers = yield (0, searchProductOffers_1.searchProductOffers)({
+        // let offers: factory.product.ITicketOffer[] = [];
+        return (0, searchProductOffers_1.searchProductOffers)({
+            ids: params.ids,
             itemOffered: { id: params.itemOffered.id },
-            sort: params.sort
+            availableAt: params.availableAt,
+            onlyValid: params.onlyValid,
+            addSortIndex: params.addSortIndex
         })(repos);
+        // Mongoへ移行(2023-03-01~)
         // 店舗条件によって対象を絞る
-        const storeId = (_b = params.availableAt) === null || _b === void 0 ? void 0 : _b.id;
-        if (typeof storeId === 'string') {
-            // アプリケーションが利用可能なオファーに絞る
-            offers = offers.filter((o) => {
-                return Array.isArray(o.availableAtOrFrom)
-                    && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === storeId);
-            });
-        }
+        // const storeId = params.availableAt?.id;
+        // if (typeof storeId === 'string') {
+        //     // アプリケーションが利用可能なオファーに絞る
+        //     offers = offers.filter((o) => {
+        //         return Array.isArray(o.availableAtOrFrom)
+        //             && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === storeId);
+        //     });
+        // }
+        // Mongoへ移行(2023-03-01~)
         // 有効期間を適用
-        if (params.onlyValid === true) {
-            offers = offers.filter((o) => {
-                let isValid = true;
-                if (o.validFrom !== undefined && moment(o.validFrom)
-                    .isAfter(now)) {
-                    isValid = false;
-                }
-                if (o.validThrough !== undefined && moment(o.validThrough)
-                    .isBefore(now)) {
-                    isValid = false;
-                }
-                return isValid;
-            });
-        }
-        return offers;
+        // if (params.onlyValid === true) {
+        //     offers = offers.filter((o) => {
+        //         let isValid = true;
+        //         if (o.validFrom !== undefined && moment(o.validFrom)
+        //             .isAfter(now)) {
+        //             isValid = false;
+        //         }
+        //         if (o.validThrough !== undefined && moment(o.validThrough)
+        //             .isBefore(now)) {
+        //             isValid = false;
+        //         }
+        //         return isValid;
+        //     });
+        // }
+        // return offers;
     });
 }
 exports.search = search;
@@ -202,8 +210,7 @@ function fixProductAndOffers(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
-        const availableOffers = yield search(Object.assign(Object.assign({ project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined), { sort: false // ソート不要(2023-01-27~)
-         }))(repos);
+        const availableOffers = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, addSortIndex: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
         return { product, availableOffers };
     });
 }

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

@@ -218,7 +218,7 @@ function processAuthorizeProductOffer(params) {
             itemOffered: { id: params.product.id },
             seller: { id: String(seller.id) },
             onlyValid: true,
-            sort: false // ソート不要(2023-01-27~)
+            addSortIndex: false
         })(repos);
         const acceptedProductOffer = offers.find((o) => o.identifier === acceptedOffer.identifier);
         if (acceptedProductOffer === undefined) {

package/package.json

@@ -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.30"
+  "version": "20.4.0-alpha.32"
 }