OZG-449 OZG-2291 pass assignedTo to grpc

goofy-server/src/main/java/de/itvsh/goofy/vorgang/VorgangRemoteService.java

@@ -2,6 +2,7 @@ package de.itvsh.goofy.vorgang;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +53,7 @@ class VorgangRemoteService {
 				.setOrderBy(GrpcOrderBy.valueOf(requestCriteria.getOrderBy().name()))
 				.setLimit(requestCriteria.getLimit())
 				.setOffset(requestCriteria.getOffset())
-				.setFilterBy(createFilterBy());
+				.setFilterBy(createFilterBy(requestCriteria.getAssignedTo()));
 	}
 
 	VorgaengeHeaderResponse buildVorgaengeHeaderResponse(GrpcFindVorgangResponse response) {
@@ -79,35 +80,39 @@ class VorgangRemoteService {
 	GrpcFindVorgangWithEingangRequest buildFindVorgangWithEingangRequest(String vorgangId) {
 		return GrpcFindVorgangWithEingangRequest.newBuilder()
 				.setId(vorgangId)
-				.setFilterBy(createFilterBy())
+				.setFilterBy(createFilterBy(Optional.empty()))
 				.build();
 	}
 
-	GrpcFilterBy createFilterBy() {
+	GrpcFilterBy createFilterBy(Optional<String> assignedTo) {
+		var builder = GrpcFilterBy.newBuilder();
+		assignedTo.ifPresent(builder::setAssignedTo);
+
 		if (userService.hasRole(UserRole.VERWALTUNG_POSTSTELLE)) {
-			return buildFilterByForPoststelle();
+			return buildFilterByForPoststelle(builder);
 		}
 		if (userService.hasRole(UserRole.EINHEITLICHER_ANSPRECHPARTNER)) {
-			return buildFilterByForEa();
+			return buildFilterByForEa(builder);
 		}
-		return buildFilterByForOtherRoles();
+
+		return buildFilterByForOtherRoles(builder);
 	}
 
-	GrpcFilterBy buildFilterByForPoststelle() {
-		return GrpcFilterBy.newBuilder()
+	GrpcFilterBy buildFilterByForPoststelle(GrpcFilterBy.Builder builder) {
+		return builder
 				.setFilterByOrganisationseinheitenId(false)
 				.addStatus(VorgangStatus.NEU.name())
 				.build();
 	}
 
-	private GrpcFilterBy buildFilterByForEa() {
-		return GrpcFilterBy.newBuilder()
+	private GrpcFilterBy buildFilterByForEa(GrpcFilterBy.Builder builder) {
+		return builder
 				.setFilterByOrganisationseinheitenId(false)
 				.build();
 	}
 
-	private GrpcFilterBy buildFilterByForOtherRoles() {
-		return GrpcFilterBy.newBuilder()
+	private GrpcFilterBy buildFilterByForOtherRoles(GrpcFilterBy.Builder builder) {
+		return builder
 				.setFilterByOrganisationseinheitenId(true)
 				.addAllOrganisationseinheitId(getOrganisationseinheitenIdsFromUser())
 				.build();

goofy-server/src/test/java/de/itvsh/goofy/vorgang/FindVorgaengeRequestCriteriaTestFactory.java

@@ -4,6 +4,8 @@ import java.util.Optional;
 
 import com.thedeanda.lorem.LoremIpsum;
 
+import de.itvsh.goofy.common.user.UserTestFactory;
+
 public class FindVorgaengeRequestCriteriaTestFactory {
 
 	public static int LIMIT = 100;
@@ -20,6 +22,7 @@ public class FindVorgaengeRequestCriteriaTestFactory {
 				.limit(LIMIT)
 				.offset(OFFSET)
 				.searchBy(Optional.of(SEARCH_BY))
-				.orderBy(ORDER_BY);
+				.orderBy(ORDER_BY)
+				.assignedTo(Optional.of(UserTestFactory.ID.toString()));
 	}
 }
\ No newline at end of file

goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangRemoteServiceTest.java

@@ -4,6 +4,9 @@ import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
+import java.util.Optional;
+
+import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -14,6 +17,7 @@ import org.mockito.Spy;
 import de.itvsh.goofy.common.user.CurrentUserService;
 import de.itvsh.goofy.common.user.GoofyUserTestFactory;
 import de.itvsh.goofy.common.user.UserRole;
+import de.itvsh.goofy.common.user.UserTestFactory;
 import de.itvsh.goofy.vorgang.Vorgang.VorgangStatus;
 import de.itvsh.ozg.pluto.vorgang.GrpcFilterBy;
 import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest;
@@ -47,7 +51,7 @@ class VorgangRemoteServiceTest {
 
 			@BeforeEach
 			void initMockReturnValues() {
-				doReturn(filterBy).when(service).createFilterBy();
+				doReturn(filterBy).when(service).createFilterBy(any());
 				doReturn(VorgangListResponseTestFactory.create()).when(service).buildVorgaengeHeaderResponse(any());
 			}
 
@@ -62,7 +66,7 @@ class VorgangRemoteServiceTest {
 			void shouldCallCreateFilterBy() {
 				callService();
 
-				verify(service).createFilterBy();
+				verify(service).createFilterBy(requestCriteria.getAssignedTo());
 			}
 
 			@Test
@@ -82,7 +86,7 @@ class VorgangRemoteServiceTest {
 
 			@BeforeEach
 			void initMockReturnValues() {
-				doReturn(filterBy).when(service).createFilterBy();
+				doReturn(filterBy).when(service).createFilterBy(any());
 			}
 
 			@Test
@@ -160,6 +164,31 @@ class VorgangRemoteServiceTest {
 	@Nested
 	class TestCreateFilterBy {
 
+		@Nested
+		class TestAssignedTo {
+
+			@BeforeEach
+			void mockUserService() {
+				when(userService.hasRole(any())).thenReturn(false);
+				when(userService.getUser()).thenReturn(GoofyUserTestFactory.create());
+			}
+
+			@Test
+			void shouldBeSetIfExists() {
+				var filterCriteria = callService(Optional.of(UserTestFactory.ID.toString()));
+
+				assertThat(filterCriteria.getAssignedTo()).isEqualTo(UserTestFactory.ID.toString());
+			}
+
+			@Test
+			void shouldNotBeSetIfNotExist() {
+				var filterCriteria = callService(Optional.empty());
+
+				assertThat(filterCriteria.getAssignedTo()).isEqualTo(StringUtils.EMPTY);
+
+			}
+		}
+
 		@Nested
 		class TestForPoststelle {
 
@@ -237,7 +266,11 @@ class VorgangRemoteServiceTest {
 		}
 
 		private GrpcFilterBy callService() {
-			return service.createFilterBy();
+			return callService(Optional.empty());
+		}
+
+		private GrpcFilterBy callService(Optional<String> assignedTo) {
+			return service.createFilterBy(assignedTo);
 		}
 	}
 
@@ -253,14 +286,14 @@ class VorgangRemoteServiceTest {
 			void mockReturnValue() {
 				when(serviceStub.findVorgangWithEingang(any())).thenReturn(GrpcVorgangWthEingangTestFactory.createVorgangWithEingangResponse());
 				when(vorgangWithEingangMapper.toVorgangWithEingang(any())).thenReturn(vorgangWithEingang);
-				doReturn(filterBy).when(service).createFilterBy();
+				doReturn(filterBy).when(service).createFilterBy(any());
 			}
 
 			@Test
 			void shouldCreateFilterBy() {
 				callService();
 
-				verify(service).createFilterBy();
+				verify(service).createFilterBy(any());
 			}
 
 			@Test
@@ -297,7 +330,7 @@ class VorgangRemoteServiceTest {
 
 			@BeforeEach
 			void mockReturnValue() {
-				doReturn(filterBy).when(service).createFilterBy();
+				doReturn(filterBy).when(service).createFilterBy(any());
 			}
 
 			@Test