diff --git a/alfa-client/apps/alfa-e2e/README.md b/alfa-client/apps/alfa-e2e/README.md
index c60ab5d519bf462b8830b8a5e6d736d295e4c032..b8daf6bedad35c68b22cb82eda4527878d5ae8a5 100644
--- a/alfa-client/apps/alfa-e2e/README.md
+++ b/alfa-client/apps/alfa-e2e/README.md
@@ -12,10 +12,10 @@ Die E2E Tests werden in parallen Jenkins Stages in seperaten Namespaces durchgef
Beispiel Namespace: sh-mastere2emain-dev
-1. Umleiten der Datenbank: `kubectl port-forward pluto-database-0 27017:27017 -n sh-mastere2emain-dev`
+1. Umleiten der Datenbank: `kubectl port-forward vorgang-manager-database-0 27017:27017 -n sh-mastere2emain-dev`
2. Umleiten des Elastic Search: `kubectl port-forward ozg-search-cluster-es-ozg-search-0 9200:9200 -n elastic-system`
-3. Host Eintrag ergänzen: In `/etc/hosts` folgenden Eintrag ergänzen: `127.0.0.1 pluto-database-0.pluto-database-svc.sh-mastere2emain-dev.svc.cluster.local`
+3. Host Eintrag ergänzen: In `/etc/hosts` folgenden Eintrag ergänzen: `127.0.0.1 vorgang-manager-database-0.vorgang-manager-database-svc.sh-mastere2emain-dev.svc.cluster.local`
4. Cypress mit entsprechender config starten: `npm run cypress:open -- --config-file cypress-master-main.json`
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/GoofyUserWithFileId.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/AlfaUserWithFileId.java
similarity index 97%
rename from alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/GoofyUserWithFileId.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/AlfaUserWithFileId.java
index bca9af32c18478364e2c5a6833162e865a93965f..de413c778ae2d049d23ac4c0ff1a1f710ba4b9e2 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/GoofyUserWithFileId.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/AlfaUserWithFileId.java
@@ -35,7 +35,7 @@ import lombok.Getter;
@Builder
@Getter
-public class GoofyUserWithFileId {
+public class AlfaUserWithFileId {
private UserProfile user;
private FileId fileId;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandler.java
index ee46850a3953a45a759529e3ba3513766bfc62a8..4fad7b87a7f420517f1652ba50fecbecc7086439 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandler.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandler.java
@@ -39,7 +39,7 @@ public class DownloadAuthenticationHandler {
boolean check(FileId fileId, Authentication auth) {
if (auth instanceof UsernamePasswordAuthenticationToken userPasswordToken) {
- var user = (GoofyUserWithFileId) userPasswordToken.getPrincipal();
+ var user = (AlfaUserWithFileId) userPasswordToken.getPrincipal();
return Objects.nonNull(fileId) && fileId.equals(user.getFileId()) && auth.isAuthenticated();
}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java
index 74cb6123a5a048f929e75491911f80e8ffa8017f..3981c95e1e7f461719d9b528d375aa9b52190e8e 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java
@@ -72,11 +72,11 @@ public class ContextService {
}
private GrpcUser createUser() {
- var goofyUser = userService.getUser();
+ var user = userService.getUser();
return GrpcUser.newBuilder()
- .setId(goofyUser.getId().toString())
- .setName(goofyUser.getFullName())
+ .setId(user.getId().toString())
+ .setName(user.getFullName())
.build();
}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java
index 466881c91649dc8b37de5ec46057b33d5e717c89..d0c0e08ecebc65b24fdd82a2b2afcd23cb97a1d8 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java
@@ -42,7 +42,7 @@ import com.auth0.jwt.exceptions.JWTVerificationException;
import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.alfa.JwtTokenUtil;
import de.ozgcloud.alfa.common.binaryfile.FileId;
-import de.ozgcloud.alfa.common.binaryfile.GoofyUserWithFileId;
+import de.ozgcloud.alfa.common.binaryfile.AlfaUserWithFileId;
import de.ozgcloud.alfa.common.user.CurrentUserService;
import de.ozgcloud.alfa.common.user.UserId;
import de.ozgcloud.alfa.common.user.UserProfile;
@@ -86,9 +86,9 @@ class DownloadTokenService {
return authenticationToken;
}
- GoofyUserWithFileId getUserFromToken(String token) {
+ AlfaUserWithFileId getUserFromToken(String token) {
Optional<Claims> claimsOptional = jwtTokenUtil.getAllClaimsFromToken(token);
- var downloadUserBuilder = GoofyUserWithFileId.builder();
+ var downloadUserBuilder = AlfaUserWithFileId.builder();
claimsOptional.ifPresent(claims -> downloadUserBuilder.user(
UserProfile.builder()
.id(UserId.from(claims.get(USERID_CLAIM, String.class)))
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserService.java
index 6ba0fc106713431e94c8974c21f50b93b6ca03a6..8dbf19e9fbc39cacb75481067c13566de38f3840 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/CurrentUserService.java
@@ -36,7 +36,7 @@ import org.springframework.security.oauth2.jwt.Jwt;
import org.springframework.stereotype.Service;
import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.ozgcloud.alfa.common.binaryfile.GoofyUserWithFileId;
+import de.ozgcloud.alfa.common.binaryfile.AlfaUserWithFileId;
@Service
public class CurrentUserService {
@@ -113,9 +113,9 @@ public class CurrentUserService {
private Optional<UserProfile> getDownloadUser() {
return Optional.of(CurrentUserHelper.getAuthentication().getPrincipal())
- .filter(GoofyUserWithFileId.class::isInstance)
- .map(GoofyUserWithFileId.class::cast)
- .map(GoofyUserWithFileId::getUser);
+ .filter(AlfaUserWithFileId.class::isInstance)
+ .map(AlfaUserWithFileId.class::cast)
+ .map(AlfaUserWithFileId::getUser);
}
Optional<String> getSingleClaimValue(String attributeName) {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/GrpcCallContextTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/GrpcCallContextTestFactory.java
index 109a5f68f2e83cc22f36fa4495ab0ec06a8229ea..8fc52b555b960fbe3f50bb0be45c559c01df5176 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/GrpcCallContextTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/GrpcCallContextTestFactory.java
@@ -30,7 +30,7 @@ import de.ozgcloud.vorgang.grpc.command.GrpcUser;
public class GrpcCallContextTestFactory {
private static final GrpcUser USER = GrpcUserTestFactory.create();
- public static final String CLIENT = "testGoofyClient";
+ public static final String CLIENT = "testClient";
public static GrpcCallContext create() {
return createBuilder().build();
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadGoofyUserTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadAlfaUserTestFactory.java
similarity index 80%
rename from alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadGoofyUserTestFactory.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadAlfaUserTestFactory.java
index 79c0ec9233e64aa26bbc94bd66bff5695a5ec77e..32ba27ca380c7bd10bb894f0d265f5428f39af4c 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadGoofyUserTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadAlfaUserTestFactory.java
@@ -25,13 +25,13 @@ package de.ozgcloud.alfa.common.binaryfile;
import de.ozgcloud.alfa.common.user.UserProfileTestFactory;
-public class DownloadGoofyUserTestFactory {
+public class DownloadAlfaUserTestFactory {
- static GoofyUserWithFileId create() {
+ static AlfaUserWithFileId create() {
return createBuilder().build();
}
- static GoofyUserWithFileId.GoofyUserWithFileIdBuilder createBuilder() {
- return GoofyUserWithFileId.builder().user(UserProfileTestFactory.create()).fileId(BinaryFileTestFactory.FILE_ID);
+ static AlfaUserWithFileId.AlfaUserWithFileIdBuilder createBuilder() {
+ return AlfaUserWithFileId.builder().user(UserProfileTestFactory.create()).fileId(BinaryFileTestFactory.FILE_ID);
}
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandlerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandlerTest.java
index d9cc748ca8211b95706ca0ad8af73fea013a1693..0b9f28493dec830c4125a9f4cb875e48a215eaaa 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandlerTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/DownloadAuthenticationHandlerTest.java
@@ -69,7 +69,7 @@ class DownloadAuthenticationHandlerTest {
@BeforeEach
void init() {
when(authentication.isAuthenticated()).thenReturn(Boolean.TRUE);
- when(authentication.getPrincipal()).thenReturn(DownloadGoofyUserTestFactory.createBuilder().fileId(fileId).build());
+ when(authentication.getPrincipal()).thenReturn(DownloadAlfaUserTestFactory.createBuilder().fileId(fileId).build());
}
@Test
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieCommandHandlerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieCommandHandlerTest.java
index c52a4d2b88fd165f0e9d89c0e550b37579384b32..42980c677c5fffb908aa221e8d3a6cfeaa09c26d 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieCommandHandlerTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieCommandHandlerTest.java
@@ -143,7 +143,7 @@ class HistorieCommandHandlerTest {
void shouldReturnFalseOnOtherClient() {
var nonMatchingCommand = matchingCommand.toBuilder()
.body(Map.of("item", Map.of(HistorieCommandHandler.DIRECTION, HistorieCommandHandler.DIRECTION_OUTGOING),
- HistorieCommandHandler.CLIENT, "Goofy"))
+ HistorieCommandHandler.CLIENT, "Alfa"))
.build();
var result = handler.isOutgoingPostfachNachrichtByOzgCloudNachrichtenManager(nonMatchingCommand);
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapperTest.java
index 343dcaf5ce9b50d92c72d67721a6d465aae719ee..2fd1ad8967ec61afa3305a453806e266dea9a01f 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapperTest.java
@@ -23,18 +23,20 @@
*/
package de.ozgcloud.alfa.vorgang;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
class EingangHeaderMapperTest {
- private EingangHeaderMapper mapper = Mappers.getMapper(EingangHeaderMapper.class);
+ private final EingangHeaderMapper mapper = Mappers.getMapper(EingangHeaderMapper.class);
+ @DisplayName("To EingangHeader")
@Nested
- class TestGrpcEingangHeaderToGoofyEingangHeader {
+ class TestToEingangHeader {
@Test
void shouldMapCreatedAt() {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperTest.java
index d31f1abfe2b8cc14095d0085f47e2901a5b1529a..a469af14ce303e340305212587c036be68e025a3 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperTest.java
@@ -26,6 +26,7 @@ package de.ozgcloud.alfa.vorgang;
import static de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory.*;
import static org.assertj.core.api.Assertions.*;
+import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
@@ -42,19 +43,20 @@ class VorgangWithEingangMapperTest {
@Spy
@InjectMocks
- private VorgangWithEingangMapper mapper = Mappers.getMapper(VorgangWithEingangMapper.class);
+ private final VorgangWithEingangMapper mapper = Mappers.getMapper(VorgangWithEingangMapper.class);
@Spy
- private UserIdMapper userIdMapper = Mappers.getMapper(UserIdMapper.class);
+ private final UserIdMapper userIdMapper = Mappers.getMapper(UserIdMapper.class);
@Spy
- private BaseTypesMapper baseTypesMapper = Mappers.getMapper(BaseTypesMapper.class);
+ private final BaseTypesMapper baseTypesMapper = Mappers.getMapper(BaseTypesMapper.class);
@Mock
private EingangMapper eingangMapper;
+ @DisplayName("To VorgangWithEingang")
@Nested
- class TestGrpcVorgangWithEingangToGoofyVorgangWithEingang {
+ class TestToVorgangWithEingang {
@Test
void shouldMapCreatedAt() {
var vorgang = callMapper();