@chevre/domain 23.2.0-alpha.38 → 23.2.0-alpha.40

package/example/src/chevre/{upsertOfferCatalogItemsByIdentifier.ts → offerCatalog/upsertOfferCatalogItemsByIdentifier.ts}

@@ -1,7 +1,7 @@
 // tslint:disable:no-console
 import * as mongoose from 'mongoose';
 
-import { chevre } from '../../../lib/index';
+import { chevre } from '../../../../lib/index';
 
 const PROJECT_ID = String(process.env.PROJECT_ID);
 
@@ -35,8 +35,8 @@ async function main() {
                 },
                 $unset: {}
             }
-        ]
-        // { replace: true }
+        ],
+        { update: true }
     );
     console.log('result:', result);
 }

package/example/src/chevre/{upsertOfferCatalogsByIdentifier.ts → offerCatalog/upsertOfferCatalogsByIdentifier.ts}

@@ -1,7 +1,7 @@
 // tslint:disable:no-console
 import * as mongoose from 'mongoose';
 
-import { chevre } from '../../../lib/index';
+import { chevre } from '../../../../lib/index';
 
 const PROJECT_ID = String(process.env.PROJECT_ID);
 
@@ -35,8 +35,9 @@ async function main() {
                 },
                 $unset: {}
             }
-        ]
-        // { replace: true }
+        ],
+        { update: true }
+        // { update: false }
     );
     console.log('result:', result);
 }

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

@@ -35,7 +35,12 @@ export declare class OfferCatalogRepo {
         $unset?: {
             [key in keyof factory.offerCatalog.IOfferCatalog]?: 1;
         };
-    }[]): Promise<{
+    }[], options: {
+        /**
+         * support only update(2026-01-30~)
+         */
+        update: boolean;
+    }): Promise<{
         bulkWriteResult: BulkWriteResult;
         modifiedCatalogs: {
             id: string;

package/lib/chevre/repo/offerCatalog.js

@@ -195,11 +195,9 @@ class OfferCatalogRepo {
     /**
      * コードをキーにして冪等置換(2023-12-14~)
      */
-    upsertManyByIdentifier(params
-    // options?: {
-    // }
-    ) {
+    upsertManyByIdentifier(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { update } = options;
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const bulkWriteOps = [];
             const queryFilters = [];
@@ -218,19 +216,30 @@ class OfferCatalogRepo {
                         'project.id': { $eq: project.id },
                         identifier: { $eq: identifier }
                     });
-                    const newId = uniqid();
-                    const setOnInsert = {
-                        identifier,
-                        project,
-                        typeOf,
-                        _id: newId
-                    };
-                    const updateOne = {
-                        filter,
-                        update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
-                        upsert: true
-                    };
-                    bulkWriteOps.push({ updateOne });
+                    if (update === true) {
+                        const updateOne = {
+                            filter,
+                            update: Object.assign({ $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
+                            upsert: false
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
+                    else {
+                        // デフォルトはupsert操作
+                        const newId = uniqid();
+                        const setOnInsert = {
+                            identifier,
+                            project,
+                            typeOf,
+                            _id: newId
+                        };
+                        const updateOne = {
+                            filter,
+                            update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
+                            upsert: true
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
                 });
             }
             if (bulkWriteOps.length > 0) {

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

@@ -32,7 +32,12 @@ export declare class OfferCatalogItemRepo {
         $unset?: {
             [key in keyof factory.offerCatalog.IOfferCatalog]?: 1;
         };
-    }[]): Promise<{
+    }[], options: {
+        /**
+         * support only update(2026-01-30~)
+         */
+        update: boolean;
+    }): Promise<{
         bulkWriteResult: BulkWriteResult;
         modifiedCatalogs: {
             id: string;

package/lib/chevre/repo/offerCatalogItem.js

@@ -159,11 +159,9 @@ class OfferCatalogItemRepo {
     /**
      * コードをキーにして冪等置換(2023-12-14~)
      */
-    upsertManyByIdentifier(params
-    // options?: {
-    // }
-    ) {
+    upsertManyByIdentifier(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { update } = options;
             const bulkWriteOps = [];
             const queryFilters = [];
             if (Array.isArray(params)) {
@@ -181,17 +179,28 @@ class OfferCatalogItemRepo {
                         'project.id': { $eq: project.id },
                         identifier: { $eq: identifier }
                     });
-                    const setOnInsert = {
-                        identifier,
-                        project,
-                        typeOf
-                    };
-                    const updateOne = {
-                        filter,
-                        update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
-                        upsert: true
-                    };
-                    bulkWriteOps.push({ updateOne });
+                    if (update === true) {
+                        const updateOne = {
+                            filter,
+                            update: Object.assign({ $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
+                            upsert: false
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
+                    else {
+                        // デフォルトはupsert操作
+                        const setOnInsert = {
+                            identifier,
+                            project,
+                            typeOf
+                        };
+                        const updateOne = {
+                            filter,
+                            update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
+                            upsert: true
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
                 });
             }
             if (bulkWriteOps.length > 0) {

package/package.json

@@ -116,5 +116,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.38"
+  "version": "23.2.0-alpha.40"
 }

package/example/src/chevre/offers/createSampleOffers.ts

@@ -1,154 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-const NUM_CREATE_OFFERS = 300;
-const NUM_CREATE_SUB_CATALOGS = 10;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const aggregateOfferRepo = await chevre.repository.AggregateOffer.createInstance(mongoose.connection);
-    const offerCatalogRepo = await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-    const offerCatalogItemRepo = await chevre.repository.OfferCatalogItem.createInstance(mongoose.connection);
-
-    const savingOffers: Omit<chevre.factory.unitPriceOffer.IUnitPriceOffer, 'id'>[] =
-        // tslint:disable-next-line:prefer-array-literal
-        [...Array(NUM_CREATE_OFFERS)].map<Omit<chevre.factory.unitPriceOffer.IUnitPriceOffer, 'id'>>((__, i) => {
-            const identifier = `sampleFreeOffer${i}`;
-            const priceSpecification: chevre.factory.unitPriceOffer.IUnitPriceOfferPriceSpecification = {
-                typeOf: chevre.factory.priceSpecificationType.UnitPriceSpecification,
-                priceCurrency: chevre.factory.priceCurrency.JPY,
-                valueAddedTaxIncluded: true,
-                price: 0,
-                referenceQuantity: {
-                    value: 1,
-                    typeOf: 'QuantitativeValue',
-                    unitCode: chevre.factory.unitCode.C62
-                },
-                accounting: {
-                    typeOf: 'Accounting',
-                    accountsReceivable: 0
-                }
-            };
-
-            return {
-                project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-                typeOf: chevre.factory.offerType.Offer,
-                identifier,
-                description: { en: identifier, ja: identifier },
-                alternateName: { ja: identifier },
-                name: { en: identifier, ja: identifier },
-                availability: chevre.factory.itemAvailability.InStock,
-                availableAtOrFrom: [
-                    { id: '51qbjcfr72h62m06vtv5kkhgje' }
-                ],
-                itemOffered: { typeOf: chevre.factory.product.ProductType.EventService },
-                priceCurrency: chevre.factory.priceCurrency.JPY,
-                priceSpecification
-            };
-        });
-    const saveOfferResult = await aggregateOfferRepo.upsertByIdentifier(savingOffers);
-    console.log('saveOfferResult:', saveOfferResult);
-
-    const offerIds: string[] = (Array.isArray(saveOfferResult?.modifiedOffers)) ? saveOfferResult.modifiedOffers.map(({ id }) => id) : [];
-    const catalogIdentifier = 'sampleFreeOffersCatalog';
-    const savingOfferCatalog: chevre.factory.offerCatalog.IOfferCatalog = {
-        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-        typeOf: 'OfferCatalog',
-        identifier: catalogIdentifier,
-        description: { en: catalogIdentifier, ja: catalogIdentifier },
-        name: { en: catalogIdentifier, ja: catalogIdentifier },
-        itemListElement: offerIds.map((id) => ({ id, typeOf: chevre.factory.offerType.Offer })),
-        itemOffered: { typeOf: chevre.factory.product.ProductType.EventService }
-    };
-    const saveCatalogResult = await offerCatalogRepo.saveByIdentifier(savingOfferCatalog);
-    console.log('saveCatalogResult:', saveCatalogResult);
-
-    const productId = 'sampleFreeEventService';
-    const savingProduct: chevre.factory.product.IProduct & {
-        offers?: never;
-    } = {
-        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-        typeOf: chevre.factory.product.ProductType.EventService,
-        name: { en: productId, ja: productId },
-        productID: productId,
-        hasOfferCatalog: {
-            typeOf: 'OfferCatalog',
-            itemListElement: [{ id: saveCatalogResult.id }]
-        }
-    };
-    const saveProductResult = await productRepo.upsertManyByProductId([{
-        $set: savingProduct
-    }]);
-    console.log('saveProductResult:', saveProductResult);
-
-    // 以下サブカタログ
-    const offerIds4subCatalog: string[] = (Array.isArray(saveOfferResult?.modifiedOffers))
-        // tslint:disable-next-line:no-magic-numbers
-        ? saveOfferResult.modifiedOffers.slice(0, 100)
-            .map(({ id }) => id) :
-        [];
-    const savingSubOfferCatalogs: chevre.factory.offerCatalog.IOfferCatalog[] =
-        // tslint:disable-next-line:prefer-array-literal
-        [...Array(NUM_CREATE_SUB_CATALOGS)].map<chevre.factory.offerCatalog.IOfferCatalog>((__, i) => {
-            const subCatalogIdentifier = `sampleFreeOffersSubCatalog${i}`;
-
-            return {
-                project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-                typeOf: 'OfferCatalog',
-                identifier: subCatalogIdentifier,
-                description: { en: subCatalogIdentifier, ja: subCatalogIdentifier },
-                name: { en: subCatalogIdentifier, ja: subCatalogIdentifier },
-                itemListElement: offerIds4subCatalog.map((id) => ({ id, typeOf: chevre.factory.offerType.Offer })),
-                itemOffered: { typeOf: chevre.factory.product.ProductType.EventService }
-            };
-        });
-    const saveSubCatalogResult = await offerCatalogItemRepo.upsertManyByIdentifier(savingSubOfferCatalogs.map((savingSubOfferCatalog) => {
-        return {
-            $set: savingSubOfferCatalog
-        };
-    }));
-    console.log('saveSubCatalogResult:', saveSubCatalogResult);
-
-    const subCatalogIds: string[] =
-        (Array.isArray(saveSubCatalogResult?.modifiedCatalogs)) ? saveSubCatalogResult.modifiedCatalogs.map(({ id }) => id) : [];
-    const catalogBySubCatalogIdentifier = 'sampleFreeOffersCatalogBySub';
-    const savingOfferCatalogBySubCatalog: chevre.factory.offerCatalog.IOfferCatalog = {
-        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-        typeOf: 'OfferCatalog',
-        identifier: catalogBySubCatalogIdentifier,
-        description: { en: catalogBySubCatalogIdentifier, ja: catalogBySubCatalogIdentifier },
-        name: { en: catalogBySubCatalogIdentifier, ja: catalogBySubCatalogIdentifier },
-        itemListElement: subCatalogIds.map((id) => ({ id, typeOf: 'OfferCatalog' })),
-        itemOffered: { typeOf: chevre.factory.product.ProductType.EventService }
-    };
-    const saveCatalogBySubResult = await offerCatalogRepo.saveByIdentifier(savingOfferCatalogBySubCatalog);
-    console.log('saveCatalogBySubResult:', saveCatalogBySubResult);
-
-    const productIdBySubCatalog = 'sampleFreeEventServiceBySub';
-    const savingProductBySubCatalog: chevre.factory.product.IProduct & {
-        offers?: never;
-    } = {
-        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-        typeOf: chevre.factory.product.ProductType.EventService,
-        name: { en: productIdBySubCatalog, ja: productIdBySubCatalog },
-        productID: productIdBySubCatalog,
-        hasOfferCatalog: {
-            typeOf: 'OfferCatalog',
-            itemListElement: [{ id: saveCatalogBySubResult.id }]
-        }
-    };
-    const saveProductBySubCatalogResult = await productRepo.upsertManyByProductId([{
-        $set: savingProductBySubCatalog
-    }]);
-    console.log('saveProductBySubCatalogResult:', saveProductBySubCatalogResult);
-}
-
-main()
-    .then()
-    .catch(console.error);