@chevre/domain 22.5.0-alpha.26 → 22.5.0-alpha.27

package/example/src/chevre/{migrateSellerMakesOfferAvailableAt.ts → migrateProjectMakesOfferAvailableAt.ts}

@@ -10,17 +10,15 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
+    const projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
 
-    const cursor = sellerRepo.getCursor(
+    const cursor = projectRepo.getCursor(
         {
-            // _id: { $eq: '5a392dfdfca1c8737fb6da42' }
+            // _id: { $eq: 'cinerino' }
         },
         {
             _id: 1,
             makesOffer: 1,
-            startDate: 1,
-            project: 1,
             typeOf: 1
         }
     );
@@ -30,14 +28,14 @@ async function main() {
     let updateCount = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
-        const seller: Pick<
-            chevre.factory.seller.ISeller,
-            'id' | 'typeOf' | 'name' | 'project' | 'makesOffer'
-        > = doc.toObject();
+        const project: Pick<chevre.factory.project.IProject, 'id' | 'typeOf'
+        > & {
+            makesOffer: chevre.factory.project.IMakesOffer[];
+        } = doc.toObject();
 
         console.log(
-            'alreadyMigrated?', seller.project.id, seller.typeOf, seller.id, seller.name?.ja, i);
-        const originMakesOffer = seller.makesOffer;
+            'alreadyMigrated?', project.id, i);
+        const originMakesOffer = project.makesOffer;
         const alreadyMigrated = !Array.isArray(originMakesOffer)
             || (Array.isArray(originMakesOffer)
                 && originMakesOffer.every(
@@ -46,10 +44,10 @@ async function main() {
 
         if (alreadyMigrated) {
             console.log(
-                'already migrated.', seller.project.id, seller.typeOf, seller.id, seller.name?.ja, i);
+                'already migrated.', project.id, i);
         } else {
             if (Array.isArray(originMakesOffer)) {
-                const newMakesOffer: chevre.factory.seller.IMakesOffer[] = originMakesOffer.map((offer) => {
+                const newMakesOffer: chevre.factory.project.IMakesOffer[] = originMakesOffer.map((offer) => {
                     let newAvailableAtOrFrom: { id: string } | undefined;
                     if (Array.isArray(offer.availableAtOrFrom)) {
                         newAvailableAtOrFrom = offer.availableAtOrFrom.at(0);
@@ -65,18 +63,15 @@ async function main() {
                 });
                 console.log(
                     'updating project...',
-                    seller.project.id, seller.typeOf, seller.id, seller.name?.ja, i, newMakesOffer);
-                await sellerRepo.save({
-                    id: String(seller.id),
-                    attributes: <any>{
-                        project: seller.project,
-                        makesOffer: newMakesOffer
-                    }
+                    project.id, i, newMakesOffer);
+                await projectRepo.updateMakesOfferById({
+                    id: project.id,
+                    makesOffer: newMakesOffer
                 });
                 updateCount += 1;
                 console.log(
                     'updated.',
-                    seller.project.id, seller.typeOf, seller.id, seller.name?.ja, i);
+                    project.id, i);
             }
         }
     });

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

@@ -60,6 +60,10 @@ export declare class ProjectRepo {
             useEventServiceAsProduct?: boolean;
         };
     }): Promise<void>;
+    updateMakesOfferById(params: {
+        id: string;
+        makesOffer: factory.project.IMakesOffer[];
+    }): Promise<void>;
     updateAggregateReservation(params: {
         id: string;
         aggregateReservation?: any;

package/lib/chevre/repo/project.js

@@ -140,7 +140,7 @@ class ProjectRepo {
                 hasMerchantReturnPolicy = Object.assign({ sameAs: params.hasMerchantReturnPolicy.sameAs, typeOf: 'MerchantReturnPolicy' }, (typeof params.hasMerchantReturnPolicy.identifier === 'string')
                     ? { identifier: params.hasMerchantReturnPolicy.identifier } : undefined);
             }
-            yield this.projectModel.findOneAndUpdate({ _id: params.id }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
+            yield this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
                 ? { alternateName: params.alternateName }
                 : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_d = (_c = (_b = params.settings) === null || _b === void 0 ? void 0 : _b.sendEmailMessage) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email) === 'string')
                 ? {
@@ -160,6 +160,14 @@ class ProjectRepo {
                 .exec();
         });
     }
+    updateMakesOfferById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+                $set: { makesOffer: params.makesOffer }
+            }, { projection: { _id: 1 } })
+                .exec();
+        });
+    }
     updateAggregateReservation(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, {

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

@@ -1,6 +1,8 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
-type IMakesOffer = factory.project.IMakesOffer;
+type IMakesOffer = Pick<factory.project.IMakesOffer, 'eligibleCustomerType' | 'typeOf'> & {
+    availableAtOrFrom: Pick<factory.offer.IAvailableAtOrFrom, 'id'>;
+};
 /**
  * プロジェクト提供オファーリポジトリ
  */

package/lib/chevre/repo/projectMakesOffer.js

@@ -69,7 +69,8 @@ class ProjectMakesOfferRepo {
             }
             const creatingMakesOffer = {
                 typeOf: factory.offerType.Offer,
-                availableAtOrFrom: [{ id: params.availableAtOrFrom.id }]
+                // availableAtOrFrom: [{ id: params.availableAtOrFrom.id }]
+                availableAtOrFrom: { id: params.availableAtOrFrom.id } // support non-array(2024-10-22~)
             };
             doc = yield this.projectModel.findOneAndUpdate({
                 _id: { $eq: params.offeredBy.id },
@@ -87,7 +88,9 @@ class ProjectMakesOfferRepo {
     }
     updateOne(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const updatingMakesOffer = Object.assign({ typeOf: factory.offerType.Offer, availableAtOrFrom: [{ id: params.availableAtOrFrom.id }] }, (Array.isArray(params.eligibleCustomerType))
+            const updatingMakesOffer = Object.assign({ typeOf: factory.offerType.Offer, 
+                // availableAtOrFrom: [{ id: params.availableAtOrFrom.id }],
+                availableAtOrFrom: { id: params.availableAtOrFrom.id } }, (Array.isArray(params.eligibleCustomerType))
                 ? {
                     eligibleCustomerType: params.eligibleCustomerType.map(({ codeValue }) => ({
                         codeValue,

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.387.0-alpha.0",
-    "@cinerino/sdk": "10.13.0",
+    "@chevre/factory": "4.387.0-alpha.1",
+    "@cinerino/sdk": "10.14.0",
     "@motionpicture/coa-service": "9.5.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.5.0-alpha.26"
+  "version": "22.5.0-alpha.27"
 }