INFRA-3970 | Dhruv | rename class

src/main/java/com/navi/infra/portal/v2/approvalflow/util/AdditionalApproverTeam.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 @RequiredArgsConstructor
 @Component
 @Slf4j
-public class AllowEndpointAdditionalTeam {
+public class AdditionalApproverTeam {
 
     private final TeamService teamService;
     private final EgressService egressService;

src/main/java/com/navi/infra/portal/v2/approvalflow/util/ApprovalRequestUtil.java

@@ -14,20 +14,20 @@ import org.springframework.stereotype.Component;
 @Slf4j
 public class ApprovalRequestUtil {
 
-    private final AllowEndpointAdditionalTeam allowEndpointAdditionalTeam;
+    private final AdditionalApproverTeam additionalApproverTeam;
     private final MapUtil mapUtil;
     private final Map<String, Pair<String, Function<Object, List<String>>>> pathAdditionalApprover;
 
     @SuppressWarnings("unchecked")
     public ApprovalRequestUtil(
-        AllowEndpointAdditionalTeam allowEndpointAdditionalTeam,
+        AdditionalApproverTeam additionalApproverTeam,
         MapUtil mapUtil
     ) {
-        this.allowEndpointAdditionalTeam = allowEndpointAdditionalTeam;
+        this.additionalApproverTeam = additionalApproverTeam;
         this.mapUtil = mapUtil;
         this.pathAdditionalApprover = Map.of("/deployment/allowEndpoint",
             Pair.of("ENDPOINT_OWNER_TEAM",
-                obj -> this.allowEndpointAdditionalTeam.getAllowEndpointAdditionalTeam(
+                obj -> this.additionalApproverTeam.getAllowEndpointAdditionalTeam(
                     (List<Map<String, Object>>) obj))
         );
     }

src/test/java/com/navi/infra/portal/v2/changerequest/service/ApprovalRequestServiceImplTest.java

@@ -16,7 +16,6 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.navi.infra.portal.domain.manifest.Manifest;
 import com.navi.infra.portal.domain.user.Team;
 import com.navi.infra.portal.domain.user.User;
-import com.navi.infra.portal.repository.ManifestRepository;
 import com.navi.infra.portal.service.manifest.ManifestService;
 import com.navi.infra.portal.service.user.PrivilegeUtilService;
 import com.navi.infra.portal.service.user.UserService;
@@ -27,7 +26,7 @@ import com.navi.infra.portal.v2.approvalflow.entity.RequestType;
 import com.navi.infra.portal.v2.approvalflow.repository.ApprovalRequestRepository;
 import com.navi.infra.portal.v2.approvalflow.service.ApprovalRequestService;
 import com.navi.infra.portal.v2.approvalflow.service.ApprovalRequestServiceImpl;
-import com.navi.infra.portal.v2.approvalflow.util.AllowEndpointAdditionalTeam;
+import com.navi.infra.portal.v2.approvalflow.util.AdditionalApproverTeam;
 import com.navi.infra.portal.v2.approvalflow.util.ApprovalRequestUtil;
 import com.navi.infra.portal.v2.changerequest.entity.ChangeRequestBuilder;
 import com.navi.infra.portal.v2.exception.NotFoundException;
@@ -64,7 +63,9 @@ public class ApprovalRequestServiceImplTest {
     private ApprovalRequest ar1, ar2;
     private ApprovalRequestService service;
     @Mock
-    private AllowEndpointAdditionalTeam allowEndpointAdditionalTeam;
+    private AdditionalApproverTeam additionalApproverTeam;
+    private final ApprovalRequestUtil approvalRequestUtil = new ApprovalRequestUtil(
+        additionalApproverTeam, mapUtil);
     @Mock
     private ChangeRequestSlackService changeRequestSlackService;
     @Mock
@@ -79,15 +80,11 @@ public class ApprovalRequestServiceImplTest {
     private PrivilegeUtilService privilegeUtilService;
     @Mock
     private ManifestLimitService manifestLimitService;
-
     @Mock
     private ChangeRequestService changeRequestService;
-
     @Mock
     private TokenRequestService tokenRequestService;
 
-    private final ApprovalRequestUtil approvalRequestUtil = new ApprovalRequestUtil(allowEndpointAdditionalTeam, mapUtil);
-
     @BeforeEach
     void setUp() {
         user1.setId(1L);
@@ -116,8 +113,9 @@ public class ApprovalRequestServiceImplTest {
             .setRequestType(RequestType.CHANGE_REQUEST).setTeamId(team2.getId())
             .createApprovalRequest();
 
-        service = new ApprovalRequestServiceImpl(repo, teamService, userService, manifestService, null, changeRequestService, null,
-            privilegeUtilService, changeRequestSlackService,null, null);
+        service = new ApprovalRequestServiceImpl(repo, teamService, userService, manifestService,
+            null, changeRequestService, null,
+            privilegeUtilService, changeRequestSlackService, null, null);
     }
 
     @Test
@@ -125,7 +123,8 @@ public class ApprovalRequestServiceImplTest {
     void approvalShouldFailIfAllApprovalsAreAlreadyDone() {
         when(repo.findPendingByRequestId(crId1)).thenReturn(Optional.empty());
 
-        service = new ApprovalRequestServiceImpl(repo, teamService, userService, null, null, null, null,
+        service = new ApprovalRequestServiceImpl(repo, teamService, userService, null, null, null,
+            null,
             privilegeUtilService, changeRequestSlackService, null, null);
 
         final var exception = assertThrows(NotFoundException.class,
@@ -157,8 +156,10 @@ public class ApprovalRequestServiceImplTest {
         when(manifestService.fetchById(1L)).thenReturn(manifest);
         when(changeRequestService.findById(1L)).thenReturn(Optional.of(changeRequest));
 
-        service = new ApprovalRequestServiceImpl(repo, teamService,userService, manifestService, null,
-            changeRequestService, tokenRequestService, privilegeUtilService, changeRequestSlackService, null, null);
+        service = new ApprovalRequestServiceImpl(repo, teamService, userService, manifestService,
+            null,
+            changeRequestService, tokenRequestService, privilegeUtilService,
+            changeRequestSlackService, null, null);
 
         final var approvedRequest = service.allowApproveRequest(requestApproval.getId(),
             user1.getId());
@@ -195,7 +196,8 @@ public class ApprovalRequestServiceImplTest {
         when(changeRequestService.findById(requestApproval1.getId())).thenReturn(
             Optional.of(changeRequest));
         when(manifestService.fetchById(changeRequest.getManifestId())).thenReturn(manifest);
-        when(changeRequestService.reject(requestApproval1.getRequestId())).thenReturn(changeRequest);
+        when(changeRequestService.reject(requestApproval1.getRequestId())).thenReturn(
+            changeRequest);
         when(manifestService.fetchById(1L)).thenReturn(manifest);
         when(changeRequestService.findById(1L)).thenReturn(Optional.of(changeRequest));
         final var rejectedRequest = service.reject(requestApproval1.getId(),
@@ -229,7 +231,6 @@ public class ApprovalRequestServiceImplTest {
 
         final var oldApprovals = List.of(existingApprovalRequest1, existingApprovalRequest2);
 
-
         final var newApprovalRequest2 = new ApprovalRequestBuilder().from(ar1).setId(null)
             .setTeamId(team2.getId()).setRequestType(RequestType.CHANGE_REQUEST)
             .createApprovalRequest();
@@ -237,7 +238,8 @@ public class ApprovalRequestServiceImplTest {
         final var savedNewApprovalRequest2 = new ApprovalRequestBuilder().from(newApprovalRequest2)
             .setId(3L).createApprovalRequest();
 
-        when(repo.findByRequestIdAndType(changeRequest.getId(), RequestType.CHANGE_REQUEST.code)).thenReturn(oldApprovals);
+        when(repo.findByRequestIdAndType(changeRequest.getId(),
+            RequestType.CHANGE_REQUEST.code)).thenReturn(oldApprovals);
         when(teamService.findByNames(argThat(
             listMatches(List.of(team1.getName(), team2.getName(), team3.getName()))))).thenReturn(
             List.of(team1, team2, team3));
@@ -253,8 +255,9 @@ public class ApprovalRequestServiceImplTest {
                 newApprovalRequest2))))).thenReturn(
             List.of(existingApprovalRequest1, existingApprovalRequest2, savedNewApprovalRequest2));
 
-        service = new ApprovalRequestServiceImpl(repo, teamService,userService, manifestService,
-            manifestLimitService, null, null, privilegeUtilService, changeRequestSlackService, approvalRequestUtil, mapUtil);
+        service = new ApprovalRequestServiceImpl(repo, teamService, userService, manifestService,
+            manifestLimitService, null, null, privilegeUtilService, changeRequestSlackService,
+            approvalRequestUtil, mapUtil);
 
         service.createApprovals(changeRequest);