@chevre/domain 21.8.0-alpha.58 → 21.8.0-alpha.59

package/example/src/chevre/findItemListElementByCatalogId.ts

@@ -0,0 +1,23 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
+
+    const catalog = await offerCatalogRepo.findItemListElementById(
+        {
+            id: '0001',
+            project: { id: String(process.env.PROJECT_ID) }
+        }
+    );
+    console.log(catalog);
+    console.log(catalog.itemListElement.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -23,5 +23,40 @@ export declare class MongoRepository {
     };
     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<import("mongodb").UpdateResult>;
 }
 export {};

package/lib/chevre/repo/aggregateOffer.js

@@ -477,5 +477,58 @@ class MongoRepository {
             return aggregate.exec();
         });
     }
+    pushIncludedInDataCatalog(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(params.id.$in) || params.id.$in.length === 0) {
+                return;
+            }
+            const pushIncludedInDataCatalogIds = params.$push.includedInDataCatalog.$each.map((element) => element.id);
+            if (pushIncludedInDataCatalogIds.length === 0) {
+                return;
+            }
+            const newIncludedInDataCatalogs = pushIncludedInDataCatalogIds.map((catalogId) => {
+                return {
+                    id: catalogId,
+                    typeOf: 'OfferCatalog'
+                };
+            });
+            yield this.aggregateOfferModel.updateMany({
+                'project.id': { $eq: params.project.id },
+                _id: { $in: params.id.$in },
+                // includedInDataCatalogのユニークネスを保証する
+                'includedInDataCatalog.id': { $nin: pushIncludedInDataCatalogIds }
+            }, 
+            // { $addToSet: { includedInDataCatalog: { $each: newIncludedInDataCatalogs } } }
+            {
+                $push: {
+                    includedInDataCatalog: {
+                        $each: newIncludedInDataCatalogs
+                        // $slice: params.$push.includedInDataCatalog.$slice
+                    }
+                }
+            })
+                .exec();
+        });
+    }
+    /**
+     * 含まれるカタログからカタログを除外する
+     */
+    pullIncludedInDataCatalog(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const idNin = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$nin;
+            return this.aggregateOfferModel.updateMany(Object.assign({ 'project.id': { $eq: params.project.id }, 'includedInDataCatalog.id': {
+                    $exists: true,
+                    $eq: params.$pull.includedInDataCatalog.$elemMatch.id.$eq
+                } }, (Array.isArray(idNin)) ? { _id: { $nin: idNin } } : undefined), {
+                $pull: {
+                    includedInDataCatalog: {
+                        id: { $eq: params.$pull.includedInDataCatalog.$elemMatch.id.$eq }
+                    }
+                }
+            })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -52,16 +52,19 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     offers: any[];
+    includedInDataCatalog: any[];
     _id?: string | undefined;
     typeOf?: string | undefined;
     project?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     offers: any[];
+    includedInDataCatalog: any[];
     _id?: string | undefined;
     typeOf?: string | undefined;
     project?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     offers: any[];
+    includedInDataCatalog: any[];
     _id?: string | undefined;
     typeOf?: string | undefined;
     project?: any;

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

@@ -12,7 +12,8 @@ const schema = new mongoose_1.Schema({
     project: mongoose_1.SchemaTypes.Mixed,
     _id: String,
     typeOf: String,
-    offers: [mongoose_1.SchemaTypes.Mixed]
+    offers: [mongoose_1.SchemaTypes.Mixed],
+    includedInDataCatalog: [mongoose_1.SchemaTypes.Mixed]
 }, {
     collection: 'aggregateOffers',
     id: true,

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

@@ -69,6 +69,12 @@ export declare class MongoRepository {
     search(params: factory.offerCatalog.ISearchConditions): Promise<(Omit<factory.offerCatalog.IOfferCatalog, 'itemListElement'> & {
         numberOfItems?: number;
     })[]>;
+    findItemListElementById(params: {
+        id: string;
+        project: {
+            id: string;
+        };
+    }): Promise<Pick<factory.offerCatalog.IOfferCatalog, 'itemListElement'>>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/offerCatalog.js

@@ -240,6 +240,19 @@ class MongoRepository {
             return aggregate.exec();
         });
     }
+    findItemListElementById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.offerCatalogModel.findOne({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: params.id }
+            }, { 'itemListElement.id': 1 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.offerCatalogModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.offerCatalogModel.findOneAndRemove({

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.d.ts

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import { MongoRepository as AccountTitleRepo } from '../../../repo/accountTitle';
 import { MongoRepository as ActionRepo } from '../../../repo/action';
+import { MongoRepository as AggregateOfferRepo } from '../../../repo/aggregateOffer';
 import { MongoRepository as CategoryCodeRepo } from '../../../repo/categoryCode';
 import { MongoRepository as CreativeWorkRepo } from '../../../repo/creativeWork';
 import { MongoRepository as EventRepo } from '../../../repo/event';
@@ -15,6 +16,7 @@ import { MongoRepository as TaskRepo } from '../../../repo/task';
 export declare function onResourceDeleted(params: factory.task.onResourceUpdated.IData): (repos: {
     accountTitle: AccountTitleRepo;
     action: ActionRepo;
+    aggregateOffer: AggregateOfferRepo;
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
     event: EventRepo;

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onResourceDeleted = void 0;
 const factory = require("../../../factory");
+const syncOfferCatalog_1 = require("./syncOfferCatalog");
 function onResourceDeleted(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const isDeleted = params.isDeleted === true;
@@ -52,6 +53,12 @@ function onResourceDeleted(params) {
                         project: { id: params.project.id },
                         ids: params.id
                     })(repos);
+                    yield (0, syncOfferCatalog_1.syncOfferCatalog)({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        typeOf: params.typeOf,
+                        isDeleted: true
+                    })(repos);
                     break;
                 case factory.product.ProductType.EventService:
                 case factory.product.ProductType.Product:

package/lib/chevre/service/task/onResourceUpdated/syncOfferCatalog.d.ts

@@ -0,0 +1,17 @@
+import * as factory from '../../../factory';
+import { MongoRepository as AggregateOfferRepo } from '../../../repo/aggregateOffer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
+/**
+ * カタログのitemListElementを集計オファーへ同期する
+ */
+export declare function syncOfferCatalog(params: {
+    project: {
+        id: string;
+    };
+    ids: string[];
+    typeOf: factory.task.onResourceUpdated.OfferCatalogType;
+    isDeleted: boolean;
+}): (repos: {
+    aggregateOffer: AggregateOfferRepo;
+    offerCatalog: OfferCatalogRepo;
+}) => Promise<void>;

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

@@ -0,0 +1,60 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.syncOfferCatalog = void 0;
+/**
+ * カタログのitemListElementを集計オファーへ同期する
+ */
+function syncOfferCatalog(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // if (params.ids.length !== 1) {
+        //     throw new factory.errors.Argument('id', 'id.length must be 1');
+        // }
+        if (params.isDeleted) {
+            for (const offerCatalogId of params.ids) {
+                // カタログを含む全集計オファーからカタログを除外
+                yield repos.aggregateOffer.pullIncludedInDataCatalog({
+                    project: { id: params.project.id },
+                    $pull: {
+                        includedInDataCatalog: { $elemMatch: { id: { $eq: offerCatalogId } } }
+                    }
+                });
+            }
+        }
+        else {
+            for (const offerCatalogId of params.ids) {
+                // 集計オファーIDリストを検索
+                const { itemListElement } = yield repos.offerCatalog.findItemListElementById({
+                    id: offerCatalogId,
+                    project: { id: params.project.id }
+                });
+                // tslint:disable-next-line:no-console
+                console.log('onOfferCatalog', offerCatalogId, ' updated.', itemListElement.length, 'itemListElement found.', itemListElement);
+                const aggregateOfferIds = itemListElement.map((element) => element.id);
+                // カタログを含み、かつ、新しいカタログに含まれない集計オファーからカタログを除外
+                yield repos.aggregateOffer.pullIncludedInDataCatalog(Object.assign({ project: { id: params.project.id }, $pull: {
+                        includedInDataCatalog: { $elemMatch: { id: { $eq: offerCatalogId } } }
+                    } }, (aggregateOfferIds.length > 0) ? { id: { $nin: aggregateOfferIds } } : undefined));
+                if (aggregateOfferIds.length > 0) {
+                    // 新しいカタログに含まれる全集計オファーにカタログを追加
+                    yield repos.aggregateOffer.pushIncludedInDataCatalog({
+                        project: { id: params.project.id },
+                        id: { $in: aggregateOfferIds },
+                        $push: {
+                            includedInDataCatalog: { $each: [{ id: offerCatalogId }] }
+                        }
+                    });
+                }
+            }
+        }
+    });
+}
+exports.syncOfferCatalog = syncOfferCatalog;

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

@@ -13,6 +13,7 @@ exports.call = void 0;
 const factory = require("../../factory");
 const accountTitle_1 = require("../../repo/accountTitle");
 const action_1 = require("../../repo/action");
+const aggregateOffer_1 = require("../../repo/aggregateOffer");
 const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
 const event_1 = require("../../repo/event");
@@ -25,6 +26,7 @@ const product_1 = require("../../repo/product");
 const productOffer_1 = require("../../repo/productOffer");
 const task_1 = require("../../repo/task");
 const onResourceDeleted_1 = require("./onResourceUpdated/onResourceDeleted");
+const syncOfferCatalog_1 = require("./onResourceUpdated/syncOfferCatalog");
 const settings_1 = require("../../settings");
 const informResources = settings_1.settings.onResourceUpdated.informResource;
 /**
@@ -35,6 +37,7 @@ function call(data) {
         yield onResourceUpdated(data)({
             accountTitle: new accountTitle_1.MongoRepository(connectionSettings.connection),
             action: new action_1.MongoRepository(connectionSettings.connection),
+            aggregateOffer: new aggregateOffer_1.MongoRepository(connectionSettings.connection),
             categoryCode: new categoryCode_1.MongoRepository(connectionSettings.connection),
             creativeWork: new creativeWork_1.MongoRepository(connectionSettings.connection),
             event: new event_1.MongoRepository(connectionSettings.connection),
@@ -107,6 +110,15 @@ function onResourceUpdated(params) {
                         typeOf: params.typeOf
                     })(repos);
                     break;
+                // カタログに対応(2023-09-12~)
+                case 'OfferCatalog':
+                    yield (0, syncOfferCatalog_1.syncOfferCatalog)({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        typeOf: params.typeOf,
+                        isDeleted: false
+                    })(repos);
+                    break;
                 default:
                 // no op
             }

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.8.0-alpha.58"
+  "version": "21.8.0-alpha.59"
 }