@chevre/domain 21.8.0-alpha.63 → 21.8.0-alpha.64

package/example/src/chevre/syncCatalogs2aggregateOffers.ts

@@ -1,6 +1,5 @@
 // tslint:disable:no-console
 import * as mongoose from 'mongoose';
-import * as util from 'util';
 
 import { chevre } from '../../../lib/index';
 
@@ -8,80 +7,76 @@ import { chevre } from '../../../lib/index';
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
+    const now = new Date();
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
+    const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
 
-    const cursor = offerRepo.getCursor(
+    const cursor = offerCatalogRepo.getCursor(
         {
             // 'project.id': { $eq: project.id }
         },
         {
             __v: 0,
             createdAt: 0,
-            updatedAt: 0,
-            offers: 0,
-            availableAddOn: 0
+            updatedAt: 0
         }
     );
-    console.log('offers found');
+    console.log('catalogs found');
 
     let i = 0;
     let updateCount = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
-        const { _id, ...unitPriceOffer } =
-            <chevre.factory.unitPriceOffer.IUnitPriceOffer & { _id: string }>doc.toObject();
+        const { _id, ...offerCatalog } = <chevre.factory.offerCatalog.IOfferCatalog & { _id: string }>doc.toObject();
+        const aggregateOfferIds = offerCatalog.itemListElement.map((element) => element.id);
 
-        let alreadyMigrated = false;
-        const aggregateOffer = await offerRepo.findAggregateOfferById({
-            project: { id: unitPriceOffer.project.id },
-            id: String(unitPriceOffer.id)
-        });
-        let offerByAggregateOffer = aggregateOffer.offers.shift();
-        // alreadyMigrated = true;
-        console.log(unitPriceOffer, offerByAggregateOffer);
-
-        // 比較のために補完
-        if (offerByAggregateOffer !== undefined) {
-            offerByAggregateOffer = {
-                ...offerByAggregateOffer,
-                additionalProperty: (Array.isArray(offerByAggregateOffer.additionalProperty))
-                    ? offerByAggregateOffer.additionalProperty : [],
-                addOn: (Array.isArray(offerByAggregateOffer.addOn))
-                    ? offerByAggregateOffer.addOn : [],
-                availableAtOrFrom: (Array.isArray(offerByAggregateOffer.availableAtOrFrom))
-                    ? offerByAggregateOffer.availableAtOrFrom : []
-            };
-            // delete (<any>offerByAggregateOffer).$unset;
-        }
-
-        if (util.isDeepStrictEqual(unitPriceOffer, offerByAggregateOffer)) {
-            alreadyMigrated = true;
-        } else {
-            console.error(unitPriceOffer, offerByAggregateOffer);
-            throw new Error('not matched');
-        }
+        // 記載カタログの追加された単価オファーの存在を検証
+        const existingOffers = await offerRepo.search(
+            {
+                project: { id: { $eq: offerCatalog.project.id } },
+                parentOffer: {
+                    // id: { $in: aggregateOfferIds },
+                    includedInDataCatalog: { id: { $in: [String(offerCatalog.id)] } }
+                }
+            },
+            { id: 1 }
+        );
+        console.log(existingOffers.length, 'offers found', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
+        const alreadyMigrated = aggregateOfferIds.length === existingOffers.length;
 
         if (alreadyMigrated) {
-            console.log('already exist.', unitPriceOffer.project.id, unitPriceOffer.id, unitPriceOffer.identifier, i);
+            console.log('already synced.', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
         } else {
-            console.log('updating...', unitPriceOffer.project.id, unitPriceOffer.id, unitPriceOffer.identifier, i);
-            // await offerRepo.saveSyncTask({
-            //     project: { id: unitPriceOffer.project.id },
-            //     id: { $in: [String(unitPriceOffer.id)] },
-            //     identifier: { $in: [] },
-            //     isDeleted: false,
-            //     typeOf: chevre.factory.offerType.Offer,
-            //     options: { emitImmediately: false }
-            // });
+            console.log('creating task...', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
+            const syncTaskData: chevre.factory.task.onResourceUpdated.IData4common = {
+                typeOf: 'CategoryCode',
+                id: [String(offerCatalog.id)],
+                isNew: false,
+                isDeleted: false,
+                project: { id: offerCatalog.project.id },
+                useInform: false
+            };
+            const syncTask: chevre.factory.task.IAttributes<chevre.factory.taskName.OnResourceUpdated> = {
+                data: syncTaskData,
+                executionResults: [],
+                name: chevre.factory.taskName.OnResourceUpdated,
+                numberOfTried: 0,
+                project: offerCatalog.project,
+                remainingNumberOfTries: 1,
+                runsAt: now,
+                status: chevre.factory.taskStatus.Ready
+            };
+            await taskRepo.saveMany([syncTask], { emitImmediately: false });
             updateCount += 1;
-            console.log('updated.', unitPriceOffer.project.id, unitPriceOffer.id, unitPriceOffer.identifier, i);
+            console.log('task saved.', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
         }
     });
 
-    console.log(i, 'offers checked');
-    console.log(updateCount, 'offers updated');
+    console.log(i, 'catalogs checked');
+    console.log(updateCount, 'catalogs synced');
 }
 
 main()

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

@@ -61,6 +61,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     alternateName?: any;
     description?: any;
     itemOffered?: any;
+    dateSynced?: Date | undefined;
 }, 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
     alternateName?: any;
     description?: any;
     itemOffered?: any;
+    dateSynced?: Date | undefined;
 }>> & 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
     alternateName?: any;
     description?: any;
     itemOffered?: any;
+    dateSynced?: Date | undefined;
 }> & Required<{
     _id: string;
 }>, never>>;

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

@@ -24,7 +24,8 @@ const schema = new mongoose_1.Schema({
     },
     itemListElement: [mongoose_1.SchemaTypes.Mixed],
     itemOffered: mongoose_1.SchemaTypes.Mixed,
-    additionalProperty: [mongoose_1.SchemaTypes.Mixed]
+    additionalProperty: [mongoose_1.SchemaTypes.Mixed],
+    dateSynced: Date // 追加(2023-09-13~)
 }, {
     collection: 'offerCatalogs',
     id: true,

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

@@ -32,6 +32,13 @@ export declare class MongoRepository {
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.offerCatalog.ISearchConditions): any[];
     save(params: factory.offerCatalog.IOfferCatalog): Promise<factory.offerCatalog.IOfferCatalog>;
+    /**
+     * 同期日時を更新する
+     */
+    updateDateSynced(params: {
+        id: string;
+        dateSynced: Date;
+    }): Promise<void>;
     updateManyById(params: {
         id: {
             $in: string[];

package/lib/chevre/repo/offerCatalog.js

@@ -144,6 +144,15 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    /**
+     * 同期日時を更新する
+     */
+    updateDateSynced(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.offerCatalogModel.updateOne({ _id: params.id }, { $set: { dateSynced: params.dateSynced } })
+                .exec();
+        });
+    }
     updateManyById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!Array.isArray(params.id.$in) || params.id.$in.length === 0) {

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

@@ -36,8 +36,6 @@ function syncOfferCatalog(params) {
                     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: {
@@ -53,6 +51,8 @@ function syncOfferCatalog(params) {
                         }
                     });
                 }
+                // 同期済記録を補完
+                yield repos.offerCatalog.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
             }
         }
     });

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.63"
+  "version": "21.8.0-alpha.64"
 }