From 919af67c2965b8ed01eaf8d1361b1c7dc8d11ceb Mon Sep 17 00:00:00 2001 From: nicoayci <nicoayci@users.noreply.github.com> Date: Tue, 21 Jan 2025 18:37:47 +0100 Subject: [PATCH 1/3] fix(): add no arg constructor to UpdateRequestClerks --- .../java/fr/gouv/beta/selexpert/dto/UpdateRequestClerks.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/fr/gouv/beta/selexpert/dto/UpdateRequestClerks.java b/src/main/java/fr/gouv/beta/selexpert/dto/UpdateRequestClerks.java index 58e6a95..9da55ff 100644 --- a/src/main/java/fr/gouv/beta/selexpert/dto/UpdateRequestClerks.java +++ b/src/main/java/fr/gouv/beta/selexpert/dto/UpdateRequestClerks.java @@ -4,8 +4,10 @@ import jakarta.validation.constraints.NotNull; import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data +@NoArgsConstructor @AllArgsConstructor public class UpdateRequestClerks { -- GitLab From cd4c4343a237d741523dcf61f6a061a94d48cb54 Mon Sep 17 00:00:00 2001 From: nicoayci <nicoayci@users.noreply.github.com> Date: Tue, 21 Jan 2025 18:38:04 +0100 Subject: [PATCH 2/3] fix(): release note date --- RELEASE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index eff81c0..7a51c6e 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -2,9 +2,9 @@ ## Comité d'investissement #4 -### Date : 28 février 2025 +### Date : 28 janvier 2025 -### Tag : comite-4-2025-02-28 +### Tag : comite-4-2025-01-28 #### Gestion des demandes -- GitLab From cb12f5196ec976d7a41ab85d2612cd0504a9dd3b Mon Sep 17 00:00:00 2001 From: nicoayci <nicoayci@users.noreply.github.com> Date: Tue, 21 Jan 2025 18:50:31 +0100 Subject: [PATCH 3/3] fix(): email pattern apostrophe allowed --- .../java/fr/gouv/beta/selexpert/dto/CourtRegistrationForm.java | 2 +- src/main/java/fr/gouv/beta/selexpert/dto/EmailForm.java | 2 +- .../java/fr/gouv/beta/selexpert/dto/ExpertCreationForm.java | 2 +- src/main/java/fr/gouv/beta/selexpert/dto/LoginForm.java | 2 +- .../fr/gouv/beta/selexpert/request/ExpertUpdateRequest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/fr/gouv/beta/selexpert/dto/CourtRegistrationForm.java b/src/main/java/fr/gouv/beta/selexpert/dto/CourtRegistrationForm.java index d3c790a..ed00f0b 100644 --- a/src/main/java/fr/gouv/beta/selexpert/dto/CourtRegistrationForm.java +++ b/src/main/java/fr/gouv/beta/selexpert/dto/CourtRegistrationForm.java @@ -11,7 +11,7 @@ import lombok.Data; public class CourtRegistrationForm { @NotBlank - @Pattern(regexp = "[a-zA-Z0-9._%+\\-]+@[a-zA-Z0-9.\\-à èéÀÈÉ]+\\.[a-zA-Z]{2,12}") + @Pattern(regexp = "[a-zA-Z0-9._%+\\-']+@[a-zA-Z0-9.\\-à èéÀÈÉ]+\\.[a-zA-Z]{2,12}") private String email; @NotBlank private String firstName; diff --git a/src/main/java/fr/gouv/beta/selexpert/dto/EmailForm.java b/src/main/java/fr/gouv/beta/selexpert/dto/EmailForm.java index 5b15228..14b1b74 100644 --- a/src/main/java/fr/gouv/beta/selexpert/dto/EmailForm.java +++ b/src/main/java/fr/gouv/beta/selexpert/dto/EmailForm.java @@ -7,6 +7,6 @@ import lombok.Data; @Data public class EmailForm { @NotBlank - @Pattern(regexp = "[a-zA-Z0-9._%+\\-]+@[a-zA-Z0-9.\\-à èéÀÈÉ]+\\.[a-zA-Z]{2,12}") + @Pattern(regexp = "[a-zA-Z0-9._%+\\-']+@[a-zA-Z0-9.\\-à èéÀÈÉ]+\\.[a-zA-Z]{2,12}") private String email; } diff --git a/src/main/java/fr/gouv/beta/selexpert/dto/ExpertCreationForm.java b/src/main/java/fr/gouv/beta/selexpert/dto/ExpertCreationForm.java index be7e149..45ab172 100644 --- a/src/main/java/fr/gouv/beta/selexpert/dto/ExpertCreationForm.java +++ b/src/main/java/fr/gouv/beta/selexpert/dto/ExpertCreationForm.java @@ -11,7 +11,7 @@ import lombok.Data; public class ExpertCreationForm { @NotBlank - @Pattern(regexp = "[a-zA-Z0-9._%+\\-]+@[a-zA-Z0-9.\\-à èéÀÈÉ]+\\.[a-zA-Z]{2,12}") + @Pattern(regexp = "[a-zA-Z0-9._%+\\-']+@[a-zA-Z0-9.\\-à èéÀÈÉ]+\\.[a-zA-Z]{2,12}") private String email; @NotBlank diff --git a/src/main/java/fr/gouv/beta/selexpert/dto/LoginForm.java b/src/main/java/fr/gouv/beta/selexpert/dto/LoginForm.java index 2afcf6b..0d28ed4 100644 --- a/src/main/java/fr/gouv/beta/selexpert/dto/LoginForm.java +++ b/src/main/java/fr/gouv/beta/selexpert/dto/LoginForm.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class LoginForm { @NotBlank - @Pattern(regexp = "[a-zA-Z0-9._%+\\-]+@[a-zA-Z0-9.\\-à èéÀÈÉ]+\\.[a-zA-Z]{2,12}") + @Pattern(regexp = "[a-zA-Z0-9._%+\\-']+@[a-zA-Z0-9.\\-à èéÀÈÉ]+\\.[a-zA-Z]{2,12}") private String email; @NotBlank private String password; diff --git a/src/main/java/fr/gouv/beta/selexpert/request/ExpertUpdateRequest.java b/src/main/java/fr/gouv/beta/selexpert/request/ExpertUpdateRequest.java index 8a1723e..c2f174b 100644 --- a/src/main/java/fr/gouv/beta/selexpert/request/ExpertUpdateRequest.java +++ b/src/main/java/fr/gouv/beta/selexpert/request/ExpertUpdateRequest.java @@ -41,7 +41,7 @@ public class ExpertUpdateRequest { rolesAllowed = {Role.ADMIN}, message = "Only admin can modify the expert's email address.") @NotNull - @Pattern(regexp = "[a-zA-Z0-9._%+\\-]+@[a-zA-Z0-9.\\-à èéÀÈÉ]+\\.[a-zA-Z]{2,12}") + @Pattern(regexp = "[a-zA-Z0-9._%+\\-']+@[a-zA-Z0-9.\\-à èéÀÈÉ]+\\.[a-zA-Z]{2,12}") @Schema( description = "The expert's email address.", implementation = String.class, -- GitLab