@chevre/domain 22.2.0-alpha.13 → 22.2.0-alpha.14

package/example/src/chevre/projectFields.ts

@@ -8,14 +8,15 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const ticketRepo = await chevre.repository.Ticket.createInstance(mongoose.connection);
+    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
 
-    const docs = await ticketRepo.projectFields(
+    const docs = await productRepo.projectFields(
         {
             limit: 10,
             page: 1,
             project: { id: { $eq: project.id } }
         },
+        [],
         []
     );
     // tslint:disable-next-line:no-null-keyword

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

@@ -25,7 +25,7 @@
 import type { BulkWriteResult } from 'mongodb';
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection4product = keyof factory.product.IProduct | '_id';
+type IKeyOfProjection = keyof factory.product.IProduct;
 /**
  * プロダクト検索条件
  */
@@ -41,7 +41,7 @@ export declare class ProductRepo {
     /**
      * プロダクトを検索する
      */
-    searchProducts(conditions: ISearchConditions4product, inclusion: IKeyOfProjection4product[], exclusion: IKeyOfProjection4product[]): Promise<(factory.product.IProduct & {
+    projectFields(conditions: ISearchConditions4product, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<(factory.product.IProduct & {
         id: string;
     })[]>;
     deleteProductById(params: {

package/lib/chevre/repo/product.js

@@ -24,6 +24,18 @@ exports.ProductRepo = void 0;
 const product_1 = require("./mongoose/schemas/product");
 const factory = require("../factory");
 const settings_1 = require("../settings");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'typeOf',
+    'additionalProperty',
+    'availableChannel',
+    'description',
+    'hasOfferCatalog',
+    'name',
+    'productID',
+    'serviceOutput',
+    'serviceType'
+];
 /**
  * プロダクトリポジトリ
  */
@@ -154,28 +166,37 @@ class ProductRepo {
     /**
      * プロダクトを検索する
      */
-    searchProducts(conditions, inclusion, exclusion) {
+    projectFields(conditions, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = ProductRepo.CREATE_MONGO_CONDITIONS(conditions);
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
+                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
                 }
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // let projection: { [key: string]: number } = {};
+            // 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 query = this.productModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
             if (typeof conditions.limit === 'number' && conditions.limit > 0) {
                 const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
@@ -188,13 +209,13 @@ class ProductRepo {
                 query.sort({ productID: conditions.sort.productID });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-20~
+                .exec();
         });
     }
     deleteProductById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.productModel.findOneAndDelete({ _id: params.id })
+            yield this.productModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }
@@ -202,11 +223,13 @@ class ProductRepo {
      * プロダクトを保管する
      */
     saveProduct(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let doc;
+            let savedId;
             if (typeof params.id === 'string') {
                 // 上書き禁止属性を除外
-                const _a = params.$set, { id, productID, project, typeOf, offers } = _a, setFields = __rest(_a, ["id", "productID", "project", "typeOf", "offers"]);
+                const _c = params.$set, { id, productID, project, typeOf, offers } = _c, setFields = __rest(_c, ["id", "productID", "project", "typeOf", "offers"]);
                 switch (typeOf) {
                     case factory.product.ProductType.EventService:
                     case factory.product.ProductType.MembershipService:
@@ -219,30 +242,43 @@ class ProductRepo {
                         }, {
                             $set: setFields,
                             $unset: params.$unset
-                        }, { upsert: false, new: true, projection: { _id: 1 } })
+                        }, { upsert: false, new: true, projection: { _id: 1, id: { $toString: '$_id' } } })
+                            .lean()
                             .exec();
+                        if (doc === null) {
+                            throw new factory.errors.NotFound(this.productModel.modelName);
+                        }
                         break;
                     default:
                         throw new factory.errors.NotImplemented(`${typeOf} not implemented`);
                 }
+                savedId = params.id;
             }
             else {
-                const _b = params.$set, { id } = _b, createParams = __rest(_b, ["id"]);
+                const _d = params.$set, { id } = _d, createParams = __rest(_d, ["id"]);
                 if (params.createIfNotExist === true) {
                     doc = yield this.productModel.findOneAndUpdate({
                         'project.id': { $eq: createParams.project.id },
                         typeOf: { $eq: createParams.typeOf }
-                    }, { $setOnInsert: createParams }, { new: true, upsert: true, projection: { _id: 1 } })
+                    }, { $setOnInsert: createParams }, { new: true, upsert: true, projection: { _id: 1, id: { $toString: '$_id' } } })
+                        .lean()
                         .exec();
+                    if (doc === null) {
+                        throw new factory.errors.NotFound(this.productModel.modelName);
+                    }
+                    savedId = doc.id;
                 }
                 else {
-                    doc = yield this.productModel.create(createParams);
+                    // doc = await this.productModel.create(createParams);
+                    const result = yield this.productModel.insertMany(createParams, { rawResult: true });
+                    const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+                    if (typeof insertedId !== 'string') {
+                        throw new factory.errors.Internal(`product not saved unexpectedly. result:${JSON.stringify(result)}`);
+                    }
+                    savedId = insertedId;
                 }
             }
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.productModel.modelName);
-            }
-            return doc.toObject();
+            return { id: savedId };
         });
     }
     /**
@@ -297,8 +333,7 @@ class ProductRepo {
      */
     findAvailableChannel(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let paymentService;
-            paymentService = (yield this.searchProducts({
+            const paymentService = (yield this.projectFields({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },

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

@@ -165,7 +165,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.searchProducts({
+                const eventService = (yield repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: eventOffers.itemOffered.id }

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

@@ -23,7 +23,7 @@ function findEventOffers(params) {
             // 興行設定があれば興行のカタログを参照する
             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.searchProducts({
+                const eventService = (yield repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: eventOffers.itemOffered.id }

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

@@ -28,7 +28,7 @@ function start(params) {
         var _a;
         const issuedThroughId = fixIssuedThroughId(params);
         // location.issuedThroughIdからプロダクトをfixする
-        const products = yield repos.product.searchProducts({
+        const products = yield repos.product.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

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

@@ -268,7 +268,7 @@ function fixPaymentService(params) {
                 break;
             // PaymentCardの場合、プロダクト検索
             case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                paymentService = (yield repos.product.searchProducts({
+                paymentService = (yield repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },

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

@@ -86,7 +86,7 @@ function fixPaymentService(params) {
                 break;
             // PaymentCardの場合、プロダクト検索
             case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                paymentService = (yield repos.product.searchProducts({
+                paymentService = (yield repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.payAction.project.id } },

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

@@ -44,8 +44,7 @@ function start(params) {
             throw new factory.errors.ArgumentNull('object.itemOffered.id');
         }
         // プロダクト確認
-        // const product = await repos.product.findProductById({ id: productId }, [], []);
-        const product = (yield repos.product.searchProducts({
+        const product = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: productId }
@@ -138,12 +137,11 @@ 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 = await repos.product.findProductById({ id: params.issuedThrough.id }, [], []);
-        const product = (yield repos.product.searchProducts({
+        const product = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id }
-        }, [], [])).shift();
+        }, ['availableChannel'], [])).shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }

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

@@ -294,12 +294,12 @@ function validateProgramMembershipUsed(params) {
                 if (typeof issuedThroughId !== 'string' || issuedThroughId === '') {
                     throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
                 }
-                permitIssuedThrough = (yield repos.product.searchProducts({
+                permitIssuedThrough = (yield repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: issuedThroughId },
                     typeOf: { $eq: factory.product.ProductType.MembershipService }
-                }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
+                }, ['typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
                 if (permitIssuedThrough === undefined) {
                     throw new factory.errors.NotFound(factory.product.ProductType.MembershipService);
                 }
@@ -410,9 +410,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 = <Pick<factory.product.IProduct, 'availableChannel'>>
-        //     await repos.product.findProductById({ id: params.issuedThrough.id }, ['availableChannel'], []);
-        const product = (yield repos.product.searchProducts({
+        const product = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id }

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

@@ -405,9 +405,7 @@ function getAcceptedSeatNumbersAndSeatSections(params) {
 function createPermitService(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        // const product = <Pick<factory.product.IProduct, 'availableChannel'>>
-        //     await repos.product.findProductById({ id: params.issuedThrough.id }, ['availableChannel'], []);
-        const product = (yield repos.product.searchProducts({
+        const product = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id }

package/lib/chevre/service/moneyTransfer.js

@@ -329,9 +329,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 = <Pick<factory.product.IProduct, 'availableChannel'>>
-        //     await repos.product.findProductById({ id: params.issuedThrough.id }, ['availableChannel'], []);
-        const paymentCardService = (yield repos.product.searchProducts({
+        const paymentCardService = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id },

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

@@ -18,10 +18,8 @@ function searchTicketOffersByItemOffered(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        // let eventService: Pick<factory.product.IProduct, 'hasOfferCatalog' | 'project'> | undefined;
         let catalogId;
-        // const eventService = await repos.product.findProductById({ id: params.itemOffered?.id }, ['hasOfferCatalog', 'project'], []);
-        const eventService = (yield repos.product.searchProducts({
+        const eventService = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: String((_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id) }
@@ -380,9 +378,7 @@ function searchOfferAppliesToMovieTicket(params) {
         const eventOffers = event.offers;
         let catalogId;
         if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            // const eventService = <Pick<factory.product.IProduct, 'hasOfferCatalog'>>
-            //     await repos.product.findProductById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
-            const eventService = (yield repos.product.searchProducts({
+            const eventService = (yield repos.product.projectFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: eventOffers.itemOffered.id }
@@ -438,9 +434,7 @@ function searchOfferCatalogItems(params) {
         const eventOffers = event.offers;
         let catalogId;
         if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            // const eventService = <Pick<factory.product.IProduct, 'hasOfferCatalog'>>
-            //     await repos.product.findProductById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
-            const eventService = (yield repos.product.searchProducts({
+            const eventService = (yield repos.product.projectFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: eventOffers.itemOffered.id }
@@ -508,9 +502,7 @@ function searchOfferCatalogItemAvailability(params) {
         const eventOffers = event.offers;
         let catalogId;
         if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            // const eventService = <Pick<factory.product.IProduct, 'hasOfferCatalog'>>
-            //     await repos.product.findProductById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
-            const eventService = (yield repos.product.searchProducts({
+            const eventService = (yield repos.product.projectFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: eventOffers.itemOffered.id }

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

@@ -19,9 +19,7 @@ function searchProductOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // プロダクト検索
-        // const productWithOffers = <Pick<factory.product.IProduct, 'hasOfferCatalog' | 'project'>>
-        //     await repos.product.findProductById({ id: params.itemOffered.id }, ['hasOfferCatalog', 'project'], []);
-        const productWithOffers = (yield repos.product.searchProducts({
+        const productWithOffers = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.itemOffered.id }

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

@@ -68,7 +68,7 @@ export declare function search(params: {
     productOffer: ProductOfferRepo;
 }) => Promise<{
     offers: factory.product.ITicketOffer[];
-    product: Omit<factory.product.IProduct, "offers">;
+    product: factory.product.IProduct;
 }>;
 export type IAuthorizeOfferAction = factory.action.authorize.offer.product.IAction;
 /**

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

@@ -27,7 +27,7 @@ function search(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const now = moment();
-        const searchProductsResult = yield repos.product.searchProducts({
+        const searchProductsResult = yield repos.product.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -172,7 +172,7 @@ function fixProductAndOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const productId = String((_b = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.id);
-        const searchProductsResult = yield repos.product.searchProducts({
+        const searchProductsResult = yield repos.product.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

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

@@ -79,9 +79,7 @@ function validatePaymentMethod(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // プロダクトから通貨区分を取得
-        // const paymentCatdProduct = <Pick<factory.product.IProduct, 'serviceOutput'>>
-        //     await repos.product.findProductById({ id: paymentServiceId }, ['serviceOutput'], []);
-        const paymentCatdProduct = (yield repos.product.searchProducts({
+        const paymentCatdProduct = (yield repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: paymentServiceId },

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -343,10 +343,10 @@ function deleteResourcesByOfferCatalog(params) {
             const action = yield repos.action.start(deleteActionAttributes);
             try {
                 // カタログからプロダクト検索
-                const productsWithCatalog = yield repos.product.searchProducts({
+                const productsWithCatalog = yield repos.product.projectFields({
                     project: { id: { $eq: params.project.id } },
                     hasOfferCatalog: { id: { $eq: catalogId } }
-                }, ['_id'], []);
+                }, ['id'], []);
                 let deleteEventResult;
                 let updateOfferResult;
                 if (productsWithCatalog.length > 0) {

package/lib/chevre/service/task/onResourceUpdated.js

@@ -275,7 +275,7 @@ function createInformMovieTasks(params) {
 }
 function createInformProductTasks(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const products4inform = yield repos.product.searchProducts({
+        const products4inform = yield repos.product.projectFields({
             typeOf: { $eq: params.typeOf },
             id: { $in: params.ids }
         }, ['additionalProperty', 'description', 'name', 'productID', 'project', 'typeOf', 'serviceType'], []);

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": "22.2.0-alpha.13"
+  "version": "22.2.0-alpha.14"
 }

package/example/src/chevre/searchProducts.ts

@@ -1,28 +0,0 @@
-// tslint:disable:no-implicit-dependencies no-console
-import { chevre } from '../../../lib/index';
-
-import * as  mongoose from 'mongoose';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-    const products = await productRepo.searchProducts(
-        {
-            project: { id: { $eq: project.id } }
-        },
-        // ['_id', 'typeOf'],
-        [],
-        []
-    );
-    console.log('products:', products);
-    console.log(products.length, 'products found');
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);