@chevre/domain 21.35.0-alpha.34 → 21.35.0-alpha.35

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

@@ -49,7 +49,7 @@ export declare class MongoRepository {
         id: string;
         alternateName?: string;
         logo?: string;
-        hasMerchantReturnPolicy?: Pick<factory.project.IHasMerchantReturnPolicy, 'sameAs'>;
+        hasMerchantReturnPolicy?: Pick<factory.project.IHasMerchantReturnPolicy, 'sameAs' | 'identifier'>;
         name?: string;
         settings?: {
             sendEmailMessage?: factory.project.ISendEmailMessageSettings;

package/lib/chevre/repo/project.js

@@ -114,23 +114,26 @@ class MongoRepository {
     findByIdAndIUpdate(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
+            let hasMerchantReturnPolicy;
+            if (typeof ((_a = params.hasMerchantReturnPolicy) === null || _a === void 0 ? void 0 : _a.sameAs) === 'string') {
+                hasMerchantReturnPolicy = Object.assign({ sameAs: params.hasMerchantReturnPolicy.sameAs, typeOf: 'MerchantReturnPolicy' }, (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)
                 ? { 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 ((_c = (_b = (_a = params.settings) === null || _a === void 0 ? void 0 : _a.sendEmailMessage) === null || _b === void 0 ? void 0 : _b.sender) === null || _c === void 0 ? void 0 : _c.email) === 'string')
+                : 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')
                 ? {
                     'settings.sendEmailMessage': {
                         sender: { email: params.settings.sendEmailMessage.sender.email }
                     }
                 }
-                : undefined), (typeof ((_d = params.settings) === null || _d === void 0 ? void 0 : _d.sendgridApiKey) === 'string')
+                : undefined), (typeof ((_e = params.settings) === null || _e === void 0 ? void 0 : _e.sendgridApiKey) === 'string')
                 ? { 'settings.sendgridApiKey': params.settings.sendgridApiKey }
-                : undefined), (Array.isArray((_e = params.settings) === null || _e === void 0 ? void 0 : _e.tokenIssuers))
-                ? { 'settings.tokenIssuers': (_f = params.settings) === null || _f === void 0 ? void 0 : _f.tokenIssuers }
-                : undefined), (typeof ((_g = params.subscription) === null || _g === void 0 ? void 0 : _g.useEventServiceAsProduct) === 'boolean')
+                : undefined), (Array.isArray((_f = params.settings) === null || _f === void 0 ? void 0 : _f.tokenIssuers))
+                ? { 'settings.tokenIssuers': (_g = params.settings) === null || _g === void 0 ? void 0 : _g.tokenIssuers }
+                : undefined), (typeof ((_h = params.subscription) === null || _h === void 0 ? void 0 : _h.useEventServiceAsProduct) === 'boolean')
                 ? { 'subscription.useEventServiceAsProduct': params.subscription.useEventServiceAsProduct }
-                : undefined), (typeof ((_h = params.hasMerchantReturnPolicy) === null || _h === void 0 ? void 0 : _h.sameAs) === 'string')
-                ? { 'hasMerchantReturnPolicy.sameAs': params.hasMerchantReturnPolicy.sameAs }
-                : undefined), { $unset: {
+                : undefined), (hasMerchantReturnPolicy !== undefined) ? { hasMerchantReturnPolicy } : undefined), { $unset: {
                     'settings.cognito': 1 // 廃止(2023-11-10~)
                 } }))
                 .exec();

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

@@ -26,6 +26,11 @@ import { AnyExpression, Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 export type ISeller = Omit<factory.seller.ISeller, 'paymentAccepted'>;
 export type ISavingSeller = Omit<factory.seller.ISeller, 'paymentAccepted'>;
+export interface IUnset {
+    $unset?: {
+        [key: string]: 1;
+    };
+}
 export type ISellerByAggregate = Pick<ISeller, 'additionalProperty' | 'branchCode' | 'hasMerchantReturnPolicy' | 'id' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'> & {
     id: string;
 };
@@ -57,7 +62,7 @@ export declare class MongoRepository {
      */
     save(params: {
         id?: string;
-        attributes: ISavingSeller;
+        attributes: ISavingSeller & IUnset;
     }): Promise<ISavingSeller & {
         id: string;
     }>;

package/lib/chevre/repo/seller.js

@@ -199,9 +199,15 @@ class MongoRepository {
                 // 上書き禁止属性を除外(2022-08-24~)
                 const _a = params.attributes, { id, branchCode, project, typeOf } = _a, updateFields = __rest(_a, ["id", "branchCode", "project", "typeOf"]);
                 const doc = yield this.organizationModel.findOneAndUpdate({
-                    _id: params.id,
+                    _id: { $eq: params.id },
                     'project.id': { $eq: project.id }
-                }, updateFields, { upsert: false, new: true })
+                }, updateFields, {
+                    upsert: false,
+                    new: true,
+                    projection: {
+                        paymentAccepted: 0 // 除外(2023-12-01~)
+                    }
+                })
                     .exec();
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.organizationModel.modelName);

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.35.0-alpha.34"
+  "version": "21.35.0-alpha.35"
 }