[ADD] pr comments

medizininformatik-initiative · May 21, 2024 · 7403f25 · 7403f25
1 parent 7afd756
commit 7403f25
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 20 deletions.
diff --git a/src/modules/proposal/controller/__tests__/proposal-contracting.controller.spec.ts b/src/modules/proposal/controller/__tests__/proposal-contracting.controller.spec.ts
@@ -82,10 +82,10 @@ describe('ProposalContractingController', () => {
         id: 'mongoId',
       };
       const input = new RevertLocationVoteDto();
-      jest.spyOn(proposalContractingService, 'handleLocationVote');
+      jest.spyOn(proposalContractingService, 'revertLocationVote');
 
       await proposalContractingController.revertLocationVote(params, input, request);
-      expect(proposalContractingService.handleLocationVote).toHaveBeenCalledWith(
+      expect(proposalContractingService.revertLocationVote).toHaveBeenCalledWith(
         params.id,
         input.location,
         request.user,

diff --git a/src/modules/proposal/controller/__tests__/proposal-upload.controller.spec.ts b/src/modules/proposal/controller/__tests__/proposal-upload.controller.spec.ts
@@ -87,7 +87,11 @@ describe('ProposalUploadController', () => {
       jest.spyOn(proposalUploadService, 'deleteUpload');
 
       await proposalUploadController.deleteUpload(params, request);
-      expect(proposalUploadService.saveDeletedUpload).toHaveBeenCalledWith(params.mainId, params.subId, request.user);
+      expect(proposalUploadService.deleteUploadAndSaveProposal).toHaveBeenCalledWith(
+        params.mainId,
+        params.subId,
+        request.user,
+      );
     });
   });
 });
diff --git a/src/modules/proposal/controller/proposal-contracting.controller.ts b/src/modules/proposal/controller/proposal-contracting.controller.ts
@@ -68,7 +68,7 @@ export class ProposalContractingController {
   }
 
   @Auth(Role.FdpgMember)
-  @Put(':id/revertLocationVote')
+  @Post(':id/revertLocationVote')
   @UsePipes(ValidationPipe)
   @ApiNotFoundResponse({ description: 'Proposal could not be found' })
   @ApiOperation({ summary: 'FDPG member reverts locations vote ' })
@@ -80,7 +80,7 @@ export class ProposalContractingController {
     @Body() { location }: RevertLocationVoteDto,
     @Request() { user }: FdpgRequest,
   ): Promise<void> {
-    return await this.proposalContractingService.handleLocationVote(id, location, user);
+    return await this.proposalContractingService.revertLocationVote(id, location, user);
   }
 
   @Auth(Role.FdpgMember)

diff --git a/src/modules/proposal/controller/proposal-upload.controller.ts b/src/modules/proposal/controller/proposal-upload.controller.ts
@@ -65,6 +65,6 @@ export class ProposalUploadController {
   @HttpCode(204)
   @ApiOperation({ summary: 'Deletes a proposal upload' })
   async deleteUpload(@Param() { mainId, subId }: MongoTwoIdsParamDto, @Request() { user }: FdpgRequest): Promise<void> {
-    return await this.proposalUploadService.saveDeletedUpload(mainId, subId, user);
+    return await this.proposalUploadService.deleteUploadAndSaveProposal(mainId, subId, user);
   }
 }
diff --git a/src/modules/proposal/decorators/expose-history.decorator.ts b/src/modules/proposal/decorators/expose-history.decorator.ts
@@ -12,7 +12,7 @@ export const ExposeHistory = () => (target: Object, propertyKey: string) => {
     const isFdpgMember = user.singleKnownRole === 'FdpgMember';
 
     const filteredEvents = params.obj[propertyKey].filter((event: HistoryEvent) => {
-      const isRevertEvent = event.type === HistoryEventType.FdpgRevertedLocationVote;
+      const isRevertEvent = event.type === HistoryEventType.FdpgLocationVoteReverted;
 
       if (isRevertEvent && isFdpgMember) {
         return true;

diff --git a/src/modules/proposal/enums/history-event.enum.ts b/src/modules/proposal/enums/history-event.enum.ts
@@ -30,7 +30,7 @@ export enum HistoryEventType {
   FdpgApprovedLocationRemoved = 'FDPG_APPROVED_LOCATION_REMOVED',
 
   /** FDPG reverts DIZ and UAC vote */
-  FdpgRevertedLocationVote = 'FDPG_REVERTED_LOCATION_VOTE',
+  FdpgLocationVoteReverted = 'FDPG_REVERTED_LOCATION_VOTE',
 
   /** Data Delivery */
 

diff --git a/src/modules/proposal/services/__tests__/proposal-contracting.service.spec.ts b/src/modules/proposal/services/__tests__/proposal-contracting.service.spec.ts
@@ -146,7 +146,6 @@ describe('ProposalContractingService', () => {
             handleProposalUacApproval: jest.fn(),
             handleProposalStatusChange: jest.fn(),
             handleProposalContractSign: jest.fn(),
-            handleLocationVote: jest.fn(),
           },
         },
         {
@@ -251,7 +250,7 @@ describe('ProposalContractingService', () => {
       const location = MiiLocation.UKL;
       jest.spyOn(proposalCrudService, 'findDocument').mockResolvedValueOnce(proposalDocument);
 
-      await proposalContractingService.handleLocationVote(proposalId, request.user.miiLocation, request.user);
+      await proposalContractingService.revertLocationVote(proposalId, request.user.miiLocation, request.user);
 
       expect(validateRevertLocationVote).toHaveBeenCalledWith(proposalDocument, location);
       expect(revertLocationVote).toHaveBeenCalledWith(

diff --git a/src/modules/proposal/services/proposal-contracting.service.ts b/src/modules/proposal/services/proposal-contracting.service.ts
@@ -90,7 +90,7 @@ export class ProposalContractingService {
     await this.eventEngineService.handleProposalUacApproval(saveResult, vote.value, user.miiLocation);
   }
 
-  async handleLocationVote(proposalId: string, location: MiiLocation, user: IRequestUser): Promise<void> {
+  async revertLocationVote(proposalId: string, location: MiiLocation, user: IRequestUser): Promise<void> {
     const toBeUpdated = await this.proposalCrudService.findDocument(proposalId, user, undefined, true);
     validateRevertLocationVote(toBeUpdated, location);
 

diff --git a/src/modules/proposal/services/proposal-upload.service.ts b/src/modules/proposal/services/proposal-upload.service.ts
@@ -72,7 +72,7 @@ export class ProposalUploadService {
     proposal.uploads.splice(uploadIndex, 1);
   }
 
-  async saveDeletedUpload(proposalId: string, uploadId: string, user: IRequestUser): Promise<void> {
+  async deleteUploadAndSaveProposal(proposalId: string, uploadId: string, user: IRequestUser): Promise<void> {
     const proposal = await this.proposalCrudService.findDocument(proposalId, user, undefined, true);
 
     await this.deleteUpload(proposal, uploadId, user);

diff --git a/src/modules/proposal/utils/__tests__/add-location-vote.util.spec.ts b/src/modules/proposal/utils/__tests__/add-location-vote.util.spec.ts
@@ -19,7 +19,6 @@ import { clearLocationsVotes } from '../location-flow.util';
 
 jest.mock('../location-flow.util', () => ({
   clearLocationsVotes: jest.fn(),
-  deleteConditionalUpload: jest.fn(),
 }));
 
 jest.mock('../add-fdpg-task.util', () => ({

diff --git a/src/modules/proposal/utils/__tests__/proposal-history.util.spec.ts b/src/modules/proposal/utils/__tests__/proposal-history.util.spec.ts
@@ -196,12 +196,12 @@ describe('ProposalHistoryUtil', () => {
     it('should add history item for reverted location vote', () => {
       const request = getRequest();
       const proposal = getProposalDocument();
-      const location = MiiLocation.UKRUB;
+      const location = MiiLocation.UKL;
 
       addHistoryItemForRevertLocationVote(proposal, request.user, location);
       expect(proposal.history.length).toBe(1);
 
-      const expectedType = HistoryEventType.FdpgRevertedLocationVote;
+      const expectedType = HistoryEventType.FdpgLocationVoteReverted;
       expect(proposal.history[0].type).toBe(expectedType);
     });
   });

diff --git a/src/modules/proposal/utils/__tests__/revert-location-vote.util.spec.ts b/src/modules/proposal/utils/__tests__/revert-location-vote.util.spec.ts
@@ -105,7 +105,7 @@ describe('revertLocationVoteUtil', () => {
       await revertLocationVote(proposal, declineReason.location, request.user, proposalUploadServiceMock);
 
       expect(getLocationStateMock).toBeCalledWith(proposal, request.user);
-      expect(proposal.declineReasons).not.toEqual([declineReason]);
+      expect(proposal.declineReasons).toEqual([declineReason]);
       expect(proposal.declineReasons.length).toEqual(0);
       expect(clearLocationsVotes).toBeCalledWith(proposal, declineReason.location);
       expect(proposal.requestedButExcludedLocations).not.toEqual([request.user.miiLocation]);

diff --git a/src/modules/proposal/utils/proposal-history.util.ts b/src/modules/proposal/utils/proposal-history.util.ts
@@ -136,7 +136,7 @@ export const addHistoryItemForRevertLocationVote = (
   user: IRequestUser,
   location: MiiLocation,
 ): void => {
-  const type = HistoryEventType.FdpgRevertedLocationVote;
+  const type = HistoryEventType.FdpgLocationVoteReverted;
 
   pushHistoryItem(proposalAfterChanges, user, type, location);
 };

diff --git a/src/modules/proposal/utils/revert-location-vote.util.ts b/src/modules/proposal/utils/revert-location-vote.util.ts
@@ -27,9 +27,7 @@ export const revertLocationVote = async (
   proposal.totalPromisedDataAmount = proposal.totalPromisedDataAmount - locationDataAmount;
   const isDataAmountReached = proposal.totalPromisedDataAmount >= (proposal.requestedData.desiredDataAmount ?? 0);
 
-  if (locationState.requestedButExcluded) {
-    proposal.declineReasons = proposal.declineReasons.filter((reason) => reason.location !== location);
-  }
+  proposal.declineReasons = proposal.declineReasons.filter((reason) => reason.location !== location);
 
   if (locationState.uacApproved) {
     proposal.uacApprovals = proposal.uacApprovals.filter((approval) => approval.location !== location);