@chevre/domain 21.30.0-alpha.32 → 21.30.0-alpha.33

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

@@ -1,10 +1,13 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-export type IObject = factory.authorization.IObject;
 export type ICode = string;
 type IFindValidOneResult = Pick<factory.authorization.IAuthorization, 'object' | 'typeOf' | 'audience'> & {
     id: string;
 };
+type ISaveParams = Pick<factory.authorization.IAuthorization, 'audience' | 'author' | 'code' | 'issuedBy' | 'project' | 'validFrom' | 'object'> & {
+    expiresInSeconds: number;
+};
+type IPublishParams = Pick<ISaveParams, 'audience' | 'author' | 'expiresInSeconds' | 'issuedBy' | 'object' | 'project' | 'validFrom'>;
 /**
  * 承認リポジトリ
  */
@@ -15,17 +18,7 @@ export declare class AuthorizationRepo {
     /**
      * コードを発行する
      */
-    publish(params: {
-        project: {
-            id: string;
-            typeOf: factory.organizationType.Project;
-        };
-        object: IObject;
-        validFrom: Date;
-        expiresInSeconds: number;
-        audience?: factory.authorization.IAudience;
-        author: factory.authorization.IAuthor;
-    }[]): Promise<factory.authorization.IAuthorization[]>;
+    publish(params: IPublishParams[]): Promise<factory.authorization.IAuthorization[]>;
     /**
      * コードで有効な承認を参照する
      */

package/lib/chevre/repo/code.js

@@ -83,11 +83,6 @@ class AuthorizationRepo {
                 }
             }
         }
-        // if (Array.isArray(params.codes)) {
-        //     andConditions.push({
-        //         code: { $exists: true, $in: params.codes }
-        //     });
-        // }
         if (params.validFrom instanceof Date) {
             andConditions.push({ validUntil: { $gte: params.validFrom } });
         }
@@ -194,15 +189,15 @@ class AuthorizationRepo {
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.length > 0) {
-                const docs = params.map(({ project, code, object, validFrom, expiresInSeconds, audience, author }) => {
+                const docs = params.map(({ project, code, object, validFrom, expiresInSeconds, audience, author, issuedBy }) => {
                     const validUntil = moment(validFrom)
                         .add(expiresInSeconds, 'seconds')
                         .toDate();
-                    return Object.assign({ project, typeOf: 'Authorization', author,
+                    return Object.assign(Object.assign({ project, typeOf: 'Authorization', author,
                         code,
                         object,
                         validFrom,
-                        validUntil }, (typeof (audience === null || audience === void 0 ? void 0 : audience.id) === 'string') ? { audience } : undefined);
+                        validUntil }, (typeof (audience === null || audience === void 0 ? void 0 : audience.id) === 'string') ? { audience } : undefined), (typeof (issuedBy === null || issuedBy === void 0 ? void 0 : issuedBy.id) === 'string') ? { issuedBy } : undefined);
                 });
                 const result = yield this.authorizationModel.insertMany(docs, { ordered: false, rawResult: true });
                 if (result.insertedCount !== docs.length) {

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

@@ -29,7 +29,8 @@ const schemaDefinition = {
         required: true
     },
     audience: mongoose_1.SchemaTypes.Mixed,
-    author: mongoose_1.SchemaTypes.Mixed // add(2024-05-02~)
+    author: mongoose_1.SchemaTypes.Mixed,
+    issuedBy: mongoose_1.SchemaTypes.Mixed // add(2024-05-06~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/service/code.d.ts

@@ -1,8 +1,7 @@
 import type { MongoRepository as ActionRepo } from '../repo/action';
-import type { AuthorizationRepo } from '../repo/code';
+import type { AuthorizationRepo, ICode } from '../repo/code';
 import * as factory from '../factory';
 type IToken = string;
-type ICode = string;
 interface IPayload {
     sub: string;
     aud?: string;

package/lib/chevre/service/code.js

@@ -14,8 +14,8 @@ exports.verifyToken = exports.getToken = void 0;
  * 承認サービス
  */
 const jwt = require("jsonwebtoken");
-const factory = require("../factory");
 const credentials_1 = require("../credentials");
+const factory = require("../factory");
 const ALGORITHM = 'HS256';
 /**
  * コードをトークンに変換する

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.js

@@ -66,7 +66,10 @@ function confirm(params) {
         if (typeof publishCodeExpiresInSeconds === 'number') {
             code = yield (0, publishCode_1.publishCode)({
                 project: { id: transaction.project.id },
-                object: { orderNumber },
+                object: {
+                    orderNumber,
+                    seller: { id: transaction.seller.id }
+                },
                 validFrom: params.result.order.orderDate,
                 expiresInSeconds: publishCodeExpiresInSeconds,
                 author: { id: transaction.agent.id, typeOf: transaction.agent.typeOf }

package/lib/chevre/service/transaction/placeOrderInProgress/publishCode.d.ts

@@ -4,8 +4,14 @@ declare function publishCode(params: {
     project: {
         id: string;
     };
+    /**
+     * 承認対象(注文)
+     */
     object: {
         orderNumber: string;
+        seller: {
+            id: string;
+        };
     };
     validFrom: Date;
     expiresInSeconds: number;

package/lib/chevre/service/transaction/placeOrderInProgress/publishCode.js

@@ -18,6 +18,7 @@ function publishCode(params) {
             typeOf: factory.order.OrderType.Order,
             orderNumber: params.object.orderNumber
         };
+        const issuedBy = { id: params.object.seller.id, typeOf: factory.organizationType.Corporation };
         let authorizations;
         try {
             authorizations = yield repos.authorization.publish([{
@@ -25,7 +26,8 @@ function publishCode(params) {
                     object: authorizationObject,
                     validFrom: params.validFrom,
                     expiresInSeconds: params.expiresInSeconds,
-                    author: params.author
+                    author: params.author,
+                    issuedBy // add issuedBy(2024-05-06~)
                 }]);
         }
         catch (error) {

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.369.0-alpha.6",
-    "@cinerino/sdk": "5.18.0-alpha.16",
+    "@chevre/factory": "4.369.0-alpha.7",
+    "@cinerino/sdk": "5.18.0-alpha.19",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.30.0-alpha.32"
+  "version": "21.30.0-alpha.33"
 }