@chevre/domain 21.9.0-alpha.2 → 21.9.0-alpha.4

package/example/src/chevre/{searchOfferCatalogs.ts → searchOfferCatalogItems.ts}

@@ -9,22 +9,23 @@ mongoose.Model.on('index', (...args) => {
 });
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const catalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
+    const catalogItemRepo = new chevre.repository.OfferCatalogItem(mongoose.connection);
 
     console.log('searching...');
-    const catalogs = await catalogRepo.search(
+    const catalogs = await catalogItemRepo.search(
         {
             project: { id: { $eq: PROJECT_ID } },
-            identifier: { $eq: '0001' },
             sort: { identifier: chevre.factory.sortType.Descending },
             limit: 2,
             page: 1,
             itemListElement: { typeOf: { $eq: 'Offer' } }
+            // id: { $in: ['xxx'] }
         }
     );
-    console.log('catalogs found', catalogs.map((catalog) => `${catalog.identifier} ${catalog.numberOfItems} ${catalog.itemListElementTypeOf}`));
+    console.log(catalogs[0]?.id, typeof catalogs[0]?.id);
+    console.log('catalogs found', catalogs.map((catalog) => `${catalog.id} ${catalog.identifier} ${catalog.numberOfItems} ${catalog.itemListElementTypeOf}`));
     console.log(catalogs.length);
 }
 

package/example/src/chevre/searchOffersByCatalog.ts

@@ -14,11 +14,11 @@ async function main() {
         page: 1,
         // ids: ['xx', 'xxx', '1001', '901'],
         subOfferCatalog: {
-            id: '0001',
-            isOfferCatalogItem: false
+            id: 'xxx',
+            isOfferCatalogItem: true
         },
         excludeAppliesToMovieTicket: false,
-        useIncludeInDataCatalog: true
+        useIncludeInDataCatalog: false
     });
     // console.log(offers);
     console.log(offers.map((offer) => {

package/lib/chevre/repo/offer.js

@@ -21,6 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+const mongoose_1 = require("mongoose");
 const uniqid = require("uniqid");
 const factory = require("../factory");
 const aggregateOffer_1 = require("./mongoose/schemas/aggregateOffer");
@@ -800,12 +801,12 @@ class MongoRepository {
      */
     searchAggregateOfferIdsBySubOfferCatalog(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [{ $match: { _id: { $eq: params.id } } }];
-            if (Array.isArray(params.itemListElementIds)) {
-                matchStages.push({ $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } });
-            }
             let itemListElements;
             if (params.isOfferCatalogItem) {
+                const matchStages = [{ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(params.id) } } }]; // ObjectIdなので注意
+                if (Array.isArray(params.itemListElementIds)) {
+                    matchStages.push({ $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } });
+                }
                 itemListElements = yield this.offerCatalogItemModel.aggregate([
                     { $unwind: '$itemListElement' },
                     ...matchStages,
@@ -819,6 +820,10 @@ class MongoRepository {
                     .exec();
             }
             else {
+                const matchStages = [{ $match: { _id: { $eq: params.id } } }];
+                if (Array.isArray(params.itemListElementIds)) {
+                    matchStages.push({ $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } });
+                }
                 itemListElements = yield this.offerCatalogModel.aggregate([
                     { $unwind: '$itemListElement' },
                     ...matchStages,

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

@@ -2,7 +2,7 @@ import { Connection } from 'mongoose';
 import * as factory from '../factory';
 export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty'> & {
     numberOfItems?: number;
-    itemListElementTypeOf: 'OfferCatalog';
+    itemListElementTypeOf: factory.offerType.Offer;
 };
 /**
  * オファーカタログアイテムリポジトリ

package/lib/chevre/repo/offerCatalogItem.js

@@ -21,6 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+const mongoose_1 = require("mongoose");
 const factory = require("../factory");
 const offerCatalogItem_1 = require("./mongoose/schemas/offerCatalogItem");
 /**
@@ -32,7 +33,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -41,19 +42,17 @@ class MongoRepository {
         }
         const idIn = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$in;
         if (Array.isArray(idIn)) {
-            andConditions.push({ _id: { $in: idIn } });
+            andConditions.push({ _id: { $in: idIn.map((id) => new mongoose_1.Types.ObjectId(id)) } });
         }
-        const idRegex = (_d = params.id) === null || _d === void 0 ? void 0 : _d.$regex;
-        if (typeof idRegex === 'string' && idRegex.length > 0) {
-            andConditions.push({ _id: { $regex: new RegExp(idRegex) } });
-        }
-        const identifierEq = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
+        // const idRegex = params.id?.$regex;
+        // if (typeof idRegex === 'string' && idRegex.length > 0) {
+        //     andConditions.push({ _id: { $regex: new RegExp(idRegex) } });
+        // }
+        const identifierEq = (_d = params.identifier) === null || _d === void 0 ? void 0 : _d.$eq;
         if (typeof identifierEq === 'string') {
-            andConditions.push({
-                identifier: { $eq: identifierEq }
-            });
+            andConditions.push({ identifier: { $eq: identifierEq } });
         }
-        const identifierRegex = (_f = params.identifier) === null || _f === void 0 ? void 0 : _f.$regex;
+        const identifierRegex = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$regex;
         if (typeof identifierRegex === 'string' && identifierRegex.length > 0) {
             andConditions.push({ identifier: { $regex: new RegExp(identifierRegex) } });
         }
@@ -65,31 +64,31 @@ class MongoRepository {
                 ]
             });
         }
-        const itemListElementTypeOfEq = (_h = (_g = params.itemListElement) === null || _g === void 0 ? void 0 : _g.typeOf) === null || _h === void 0 ? void 0 : _h.$eq;
+        const itemListElementTypeOfEq = (_g = (_f = params.itemListElement) === null || _f === void 0 ? void 0 : _f.typeOf) === null || _g === void 0 ? void 0 : _g.$eq;
         if (typeof itemListElementTypeOfEq === 'string') {
             andConditions.push({ 'itemListElement.typeOf': { $exists: true, $eq: itemListElementTypeOfEq } });
         }
-        const itemListElementIdIn = (_k = (_j = params.itemListElement) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$in;
+        const itemListElementIdIn = (_j = (_h = params.itemListElement) === null || _h === void 0 ? void 0 : _h.id) === null || _j === void 0 ? void 0 : _j.$in;
         if (Array.isArray(itemListElementIdIn)) {
             andConditions.push({ 'itemListElement.id': { $exists: true, $in: itemListElementIdIn } });
         }
-        const itemListElementIdNin = (_m = (_l = params.itemListElement) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$nin;
+        const itemListElementIdNin = (_l = (_k = params.itemListElement) === null || _k === void 0 ? void 0 : _k.id) === null || _l === void 0 ? void 0 : _l.$nin;
         if (Array.isArray(itemListElementIdNin)) {
             andConditions.push({ 'itemListElement.id': { $nin: itemListElementIdNin } });
         }
-        const itemListElementIdAll = (_p = (_o = params.itemListElement) === null || _o === void 0 ? void 0 : _o.id) === null || _p === void 0 ? void 0 : _p.$all;
+        const itemListElementIdAll = (_o = (_m = params.itemListElement) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$all;
         if (Array.isArray(itemListElementIdAll)) {
             andConditions.push({ 'itemListElement.id': { $exists: true, $all: itemListElementIdAll } });
         }
-        const itemOfferedTypeOfEq = (_r = (_q = params.itemOffered) === null || _q === void 0 ? void 0 : _q.typeOf) === null || _r === void 0 ? void 0 : _r.$eq;
+        const itemOfferedTypeOfEq = (_q = (_p = params.itemOffered) === null || _p === void 0 ? void 0 : _p.typeOf) === null || _q === void 0 ? void 0 : _q.$eq;
         if (typeof itemOfferedTypeOfEq === 'string') {
             andConditions.push({ 'itemOffered.typeOf': { $exists: true, $eq: itemOfferedTypeOfEq } });
         }
-        const itemOfferedServiceTypeCodeValueEq = (_u = (_t = (_s = params.itemOffered) === null || _s === void 0 ? void 0 : _s.serviceType) === null || _t === void 0 ? void 0 : _t.codeValue) === null || _u === void 0 ? void 0 : _u.$eq;
+        const itemOfferedServiceTypeCodeValueEq = (_t = (_s = (_r = params.itemOffered) === null || _r === void 0 ? void 0 : _r.serviceType) === null || _s === void 0 ? void 0 : _s.codeValue) === null || _t === void 0 ? void 0 : _t.$eq;
         if (typeof itemOfferedServiceTypeCodeValueEq === 'string') {
             andConditions.push({ 'itemOffered.serviceType.codeValue': { $exists: true, $eq: itemOfferedServiceTypeCodeValueEq } });
         }
-        const additionalPropertyElemMatch = (_v = params.additionalProperty) === null || _v === void 0 ? void 0 : _v.$elemMatch;
+        const additionalPropertyElemMatch = (_u = params.additionalProperty) === null || _u === void 0 ? void 0 : _u.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({ additionalProperty: { $exists: true, $elemMatch: additionalPropertyElemMatch } });
         }
@@ -139,7 +138,7 @@ class MongoRepository {
                         description: '$description',
                         project: '$project',
                         typeOf: '$typeOf',
-                        id: '$_id',
+                        id: { $toString: '$_id' },
                         identifier: '$identifier',
                         itemOffered: '$itemOffered',
                         additionalProperty: '$additionalProperty',

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.9.0-alpha.2"
+  "version": "21.9.0-alpha.4"
 }