fix: UserId on create enrollment

ifspcbt-devspace · Oct 7, 2024 · 22004a0 · 22004a0
1 parent 72137b9
commit 22004a0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/...n/src/main/java/br/com/ifsp/tickets/app/enrollment/core/create/CreateEnrollmentInput.java b/...n/src/main/java/br/com/ifsp/tickets/app/enrollment/core/create/CreateEnrollmentInput.java
@@ -5,7 +5,7 @@
 import java.time.LocalDate;
 
 public record CreateEnrollmentInput(
-        User user,
+        String userId,
         String name,
         String email,
         String document,
@@ -14,7 +14,7 @@ public record CreateEnrollmentInput(
         String ticketSaleId,
         String ticketId
 ) {
-    public static CreateEnrollmentInput of(User aggregate, String name, String email, String document, LocalDate birthDate, String eventId, String ticketSaleId, String ticketId) {
-        return new CreateEnrollmentInput(aggregate, name, email, document, birthDate, eventId, ticketSaleId, ticketId);
+    public static CreateEnrollmentInput of(String userId, String name, String email, String document, LocalDate birthDate, String eventId, String ticketSaleId, String ticketId) {
+        return new CreateEnrollmentInput(userId, name, email, document, birthDate, eventId, ticketSaleId, ticketId);
     }
 }
diff --git a/...src/main/java/br/com/ifsp/tickets/app/enrollment/core/create/CreateEnrollmentUseCase.java b/...src/main/java/br/com/ifsp/tickets/app/enrollment/core/create/CreateEnrollmentUseCase.java
@@ -55,7 +55,7 @@ public CreateEnrollmentUseCase(IEventGateway eventGateway, IEnrollmentGateway en
 
     @Override
     public CreateEnrollmentOutput execute(CreateEnrollmentInput anIn) {
-        final User user = anIn.user();
+        final UserID userID = UserID.with(anIn.userId());
         String name = anIn.name();
         String emailString = anIn.email();
         LocalDate birthDate = anIn.birthDate();
@@ -71,18 +71,11 @@ public CreateEnrollmentOutput execute(CreateEnrollmentInput anIn) {
         if (!event.getStatus().equals(EventStatus.OPENED))
             Notification.create("Event is not opened").append("Event is not open for enrollment").throwPossibleErrors();
 
-        if (user != null) {
-            name = user.getName();
-            emailString = user.getEmail().getValue();
-            birthDate = user.getBirthDate();
-            document = user.getDocument().getValue();
-            alreadyExists = this.enrollmentGateway.existsByUserIDAndEventID(user.getId(), eventID);
-        } else alreadyExists = this.enrollmentGateway.existsByDocumentAndEventID(document, eventID);
+        alreadyExists = this.enrollmentGateway.existsByDocumentAndEventID(document, eventID);
 
         if (alreadyExists) {
             Notification.create("Validation Error").append("User already enrolled in this event").throwPossibleErrors();
         }
-        final UserID userID = user != null ? user.getId() : new UserID(null);
 
         final Enrollment enrollment = Enrollment
                 .newEnrollment(name, emailString, document, birthDate,

diff --git a/...ructure/src/main/java/br/com/ifsp/tickets/infra/api/controllers/EnrollmentController.java b/...ructure/src/main/java/br/com/ifsp/tickets/infra/api/controllers/EnrollmentController.java
@@ -42,7 +42,7 @@ public class EnrollmentController implements EnrollmentAPI {
     public ResponseEntity<String> create(CreateEnrollmentRequest request) {
         final UserJpaEntity authenticatedUser = (UserJpaEntity) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         final CreateEnrollmentInput input = CreateEnrollmentInput.of(
-                authenticatedUser.toAggregate(),
+                authenticatedUser.toAggregate().getId().getValue().toString(),
                 request.name(),
                 request.email(),
                 request.document(),
@@ -96,7 +96,7 @@ public ResponseEntity<Void> webhook(CreatePaymentRequest request) {
 
         GetUpsertEnrollmentOutput output = this.enrollmentService.getUpsertEnrollment(in);
         final CreateEnrollmentInput input = CreateEnrollmentInput.of(
-                null,
+                output.userID(),
                 output.name(),
                 output.email(),
                 output.document(),