@chevre/domain 22.7.0-alpha.12 → 22.7.0-alpha.13

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.d.ts

@@ -10,10 +10,11 @@ interface IAcceptRepos {
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;
 }
-type IAccepteOfferParams = Pick<factory.task.acceptCOAOffer.IData, 'object' | 'potentialActions' | 'purpose'> & {
+type IAccepteOfferParams = Pick<factory.task.acceptCOAOffer.IData, 'object' | 'potentialActions' | 'purpose' | 'agent'> & {
     sameAs: {
         id: string;
     };
+    isMember: boolean;
 };
 /**
  * COA興行オファー採用

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -58,7 +58,8 @@ function acceptOffer(params) {
             project: transaction.project,
             typeOf: factory.actionType.AcceptAction,
             object: params.object,
-            agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
+            // agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
+            agent: { id: params.agent.id, typeOf: params.agent.typeOf },
             purpose: { id: transaction.id, typeOf: transaction.typeOf },
             sameAs: { id: params.sameAs.id, typeOf: 'Task' },
             potentialActions: params.potentialActions,
@@ -76,7 +77,9 @@ function acceptOffer(params) {
             acceptedOffer = yield (0, authorize_1.validateOffers)(coaInfo, acceptedOffersWithoutDetails, {
                 identifier: params.object.appliesToSurfrock.identifier,
                 serviceOutput: { typeOf: params.object.appliesToSurfrock.serviceOutput.typeOf }
-            }, params.object.flgMember)({
+            }, 
+            // params.object.flgMember
+            (params.isMember) ? factory.action.accept.coaOffer.FlgMember.Member : factory.action.accept.coaOffer.FlgMember.NonMember)({
                 reserveService: repos.reserveService,
                 masterService: repos.masterService
             });
@@ -132,7 +135,8 @@ function reAcceptOffer(params) {
             project: transaction.project,
             typeOf: factory.actionType.AcceptAction,
             object: params.object,
-            agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
+            // agent: { id: transaction.agent.id, typeOf: transaction.agent.typeOf },
+            agent: { id: params.agent.id, typeOf: params.agent.typeOf },
             purpose: { id: transaction.id, typeOf: transaction.typeOf },
             sameAs: { id: params.sameAs.id, typeOf: 'Task' },
             potentialActions: params.potentialActions,
@@ -148,7 +152,9 @@ function reAcceptOffer(params) {
             acceptedOffer = yield (0, authorize_1.validateOffers)(coaInfo, acceptedOffersWithoutDetails, {
                 identifier: params.object.appliesToSurfrock.identifier,
                 serviceOutput: { typeOf: params.object.appliesToSurfrock.serviceOutput.typeOf }
-            }, params.object.flgMember)({
+            }, 
+            // params.object.flgMember
+            (params.isMember) ? factory.action.accept.coaOffer.FlgMember.Member : factory.action.accept.coaOffer.FlgMember.NonMember)({
                 reserveService: repos.reserveService,
                 masterService: repos.masterService
             });

package/lib/chevre/service/task/acceptCOAOffer.js

@@ -26,7 +26,7 @@ let coaAuthClient;
 function call(params) {
     // tslint:disable-next-line:max-func-body-length
     return ({ connection, redisClient, settings }, options) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
@@ -34,18 +34,22 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
+        const interfaceRepo = new interface_1.InterfaceRepo(connection);
+        const coaAPI = yield interfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
+        if (typeof (coaAPI === null || coaAPI === void 0 ? void 0 : coaAPI.id) !== 'string') {
+            throw new factory.errors.NotFound('WebAPI');
+        }
+        const credentials = (_a = coaAPI.availableChannel) === null || _a === void 0 ? void 0 : _a.credentials;
+        const memberClients = (_b = coaAPI.availableChannel) === null || _b === void 0 ? void 0 : _b.memberClients;
+        if (typeof (credentials === null || credentials === void 0 ? void 0 : credentials.refreshToken) !== 'string') {
+            throw new factory.errors.NotFound('WebAPI');
+        }
+        if (!Array.isArray(memberClients)) {
+            throw new factory.errors.NotFound('WebAPI.availableChannel.memberClients');
+        }
         if (coaAuthClient === undefined) {
-            const interfaceRepo = new interface_1.InterfaceRepo(connection);
-            const coaAPI = yield interfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
-            const credentials = (_a = coaAPI === null || coaAPI === void 0 ? void 0 : coaAPI.availableChannel) === null || _a === void 0 ? void 0 : _a.credentials;
-            if (typeof (credentials === null || credentials === void 0 ? void 0 : credentials.refreshToken) !== 'string') {
-                throw new factory.errors.NotFound('WebAPI');
-            }
-            if (typeof (coaAPI === null || coaAPI === void 0 ? void 0 : coaAPI.id) !== 'string') {
-                throw new factory.errors.NotFound('WebAPI');
-            }
             let credentialsRepo;
-            const credentialsExpireInSeconds = (_c = (_b = coaAPI.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.expireInSeconds;
+            const credentialsExpireInSeconds = (_d = (_c = coaAPI.availableChannel) === null || _c === void 0 ? void 0 : _c.credentials) === null || _d === void 0 ? void 0 : _d.expireInSeconds;
             if (typeof credentialsExpireInSeconds === 'number') {
                 // set credentialsRepo(2024-11-20~)
                 credentialsRepo = new credentials_1.CredentialsRepo(redisClient, {
@@ -66,13 +70,17 @@ function call(params) {
                 endpoint: coaAuthClient.options.endpoint,
                 auth: coaAuthClient
             }, { timeout: settings.coa.timeout });
-            const { object, potentialActions, purpose } = params.data;
+            const { agent, object, potentialActions, purpose } = params.data;
+            // agent.idからflgMemberを自動セット(2024-12-16~)
+            const isMember = memberClients.includes(agent.id);
             if (typeof potentialActions.id === 'string') {
                 yield (0, acceptOffer_1.reAcceptOffer)({
+                    agent,
                     object,
                     purpose,
                     potentialActions: Object.assign(Object.assign({}, potentialActions), { id: potentialActions.id }),
-                    sameAs: { id: params.id }
+                    sameAs: { id: params.id },
+                    isMember
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
@@ -83,10 +91,12 @@ function call(params) {
             }
             else {
                 yield (0, acceptOffer_1.acceptOffer)({
+                    agent,
                     object,
                     potentialActions,
                     purpose,
-                    sameAs: { id: params.id }
+                    sameAs: { id: params.id },
+                    isMember
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.391.0-alpha.1",
+    "@chevre/factory": "4.391.0-alpha.2",
     "@cinerino/sdk": "10.19.0-alpha.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.7.0-alpha.12"
+  "version": "22.7.0-alpha.13"
 }