@chevre/domain 21.9.0-alpha.3 → 21.9.0-alpha.5

package/example/src/chevre/searchOfferCatalogItems.ts

@@ -24,7 +24,8 @@ async function main() {
             // 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/mongoose/schemas/offerCatalogItem.d.ts

@@ -61,6 +61,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     description?: any;
     itemOffered?: any;
     dateSynced?: Date | undefined;
+    relatedOffer?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
     additionalProperty: any[];
@@ -72,6 +73,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     description?: any;
     itemOffered?: any;
     dateSynced?: Date | undefined;
+    relatedOffer?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
     additionalProperty: any[];
@@ -83,6 +85,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     description?: any;
     itemOffered?: any;
     dateSynced?: Date | undefined;
+    relatedOffer?: any;
 }> & {
     _id: import("mongoose").Types.ObjectId;
 }, never>>;

package/lib/chevre/repo/mongoose/schemas/offerCatalogItem.js

@@ -10,7 +10,6 @@ exports.modelName = modelName;
  */
 const schema = new mongoose_1.Schema({
     project: mongoose_1.SchemaTypes.Mixed,
-    // _id: String,
     identifier: {
         type: String,
         required: true
@@ -25,7 +24,8 @@ const schema = new mongoose_1.Schema({
     itemListElement: [mongoose_1.SchemaTypes.Mixed],
     itemOffered: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
-    dateSynced: Date
+    dateSynced: Date,
+    relatedOffer: mongoose_1.SchemaTypes.Mixed
 }, {
     collection: 'offerCatalogItems',
     id: true,

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.js

@@ -138,10 +138,11 @@ class MongoRepository {
                         description: '$description',
                         project: '$project',
                         typeOf: '$typeOf',
-                        id: '$_id',
+                        id: { $toString: '$_id' },
                         identifier: '$identifier',
                         itemOffered: '$itemOffered',
                         additionalProperty: '$additionalProperty',
+                        relatedOffer: '$relatedOffer',
                         numberOfItems: {
                             $cond: {
                                 if: { $isArray: '$itemListElement' },

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.329.0",
+    "@chevre/factory": "4.330.0-alpha.0",
     "@cinerino/sdk": "3.167.0-alpha.9",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -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.3"
+  "version": "21.9.0-alpha.5"
 }