Merge branch 'master' into dependabot/gradle/io.quarkus-quarkus-react…

…ive-pg-client-3.19.0

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'io.quarkus'
     id "org.sonarqube" version "6.0.1.5171"
-    id "io.freefair.lombok"  version "8.12.1"
+    id "io.freefair.lombok"  version "8.12.2"
 }
 
 repositories {
@@ -19,7 +19,7 @@ dependencies {
 
     // AWS
     implementation 'io.quarkiverse.amazonservices:quarkus-amazon-s3:3.2.0'
-    implementation 'software.amazon.awssdk:aws-crt-client:2.30.21'
+    implementation 'software.amazon.awssdk:aws-crt-client:2.30.26'
 
     // Elastisearch
     implementation("io.quarkus:quarkus-elasticsearch-java-client")
@@ -34,7 +34,7 @@ dependencies {
 
     implementation 'io.quarkus:quarkus-hibernate-validator'
     implementation 'org.mapstruct:mapstruct:1.6.3'
-    implementation 'io.quarkus:quarkus-mailer:3.18.3'
+    implementation 'io.quarkus:quarkus-mailer:3.19.0'
     implementation 'io.quarkus:quarkus-security-jpa'
     implementation 'io.quarkus:quarkus-smallrye-openapi'
     implementation 'org.jboss.logmanager:log4j2-jboss-logmanager'
@@ -56,7 +56,7 @@ dependencies {
     testImplementation 'io.quarkus:quarkus-junit5'
     testImplementation 'io.rest-assured:rest-assured'
     testImplementation 'org.mockito:mockito-core:5.14.2'
-    testImplementation 'io.quarkus:quarkus-junit5-mockito:3.18.3'
+    testImplementation 'io.quarkus:quarkus-junit5-mockito:3.19.0'
 }
 
 group 'com.tuvarna'

flake.nix

@@ -42,12 +42,25 @@
           };
 
           # NOTE: use devenv up to run the service
-          services.elasticsearch = {
-            enable = true;
-            cluster_name = "elasicsearch";
-            port = 9200;
+          services = {
+            postgres = {
+              enable = false;
+              initialDatabases.phd.name = {
+                name = "phd";
+                user = "phd";
+                pass = "phd";
+                listen_addresses = "127.0.0.1";
+                port = 5432;
+              };
+            };
+            elasticsearch = {
+              enable = true;
+              cluster_name = "elasicsearch";
+              port = 9200;
+            };
           };
 
+
           git-hooks.hooks = {
             # Common
             markdownlint.enable = true;

src/main/java/com/tuvarna/phd/controller/AuthController.java

@@ -1,8 +1,8 @@
 package com.tuvarna.phd.controller;
 
-import com.tuvarna.phd.entity.UserEntity;
-import com.tuvarna.phd.service.AuthService;
 import com.tuvarna.phd.dto.UnauthorizedUsersDTO;
+import com.tuvarna.phd.entity.IUserEntity;
+import com.tuvarna.phd.service.AuthService;
 import io.smallrye.mutiny.tuples.Tuple2;
 import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
@@ -12,6 +12,7 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
+import org.eclipse.microprofile.jwt.JsonWebToken;
 import org.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.enums.SecuritySchemeType;
 import org.eclipse.microprofile.openapi.annotations.media.Content;
@@ -34,13 +35,13 @@
 public final class AuthController extends BaseController {
 
   private AuthService authService;
+  @Inject JsonWebToken jwt;
   @Inject Logger LOG = Logger.getLogger(AuthController.class);
 
   public AuthController(AuthService authService) {
     this.authService = authService;
   }
 
-
   @POST
   @Operation(
       summary = "Verify the user is present in the database",
@@ -63,10 +64,17 @@ public AuthController(AuthService authService) {
                     schema = @Schema(implementation = UnauthorizedUsersDTO.class))),
       })
   @Path("/login")
-  public Response login(UnauthorizedUsersDTO userDTO) {
-    LOG.info("Received a request to login with user creds: " + userDTO);
+  public Response login() {
+    String oid = jwt.getClaim("oid");
+    String name = jwt.getClaim("name");
+    String email = jwt.getName();
+
+    LOG.info("Received a request to login with user oid: " + oid + " and email: " + email);
+
+    Tuple2<IUserEntity<?>, String> loggedUser = this.authService.login(oid, name, email);
+    IUserEntity<?> user = loggedUser.getItem1();
+    String group = loggedUser.getItem2();
 
-    Tuple2<UserEntity<?>, String> user = this.authService.login(userDTO);
-    return send("User logged in!", user.getItem1(), user.getItem2());
+    return send("User logged in!", user, group);
   }
 }

src/main/java/com/tuvarna/phd/controller/DoctoralCenterController.java

@@ -4,7 +4,7 @@
 import com.tuvarna.phd.dto.CandidateStatusDTO;
 import com.tuvarna.phd.dto.UnauthorizedUsersDTO;
 import com.tuvarna.phd.entity.UnauthorizedUsers;
-import com.tuvarna.phd.exception.CandidateException;
+import com.tuvarna.phd.exception.HttpException;
 import com.tuvarna.phd.service.DoctoralCenterService;
 import com.tuvarna.phd.validator.CandidateValidator;
 import jakarta.enterprise.context.RequestScoped;
@@ -86,7 +86,7 @@ public Response updateCandidateStatus(CandidateStatusDTO candidateDTO) {
       this.doctoralCenterService.review(candidateDTO);
     } catch (IOException exception) {
       LOG.error("Error in reading mail template: " + exception);
-      throw new CandidateException("Error in sending email. Please try again later!");
+      throw new HttpException("Error in sending email. Please try again later!");
     }
 
     return send("Candidate status changed to: " + candidateDTO.getStatus());

src/main/java/com/tuvarna/phd/controller/PhdController.java

@@ -1,7 +1,7 @@
 package com.tuvarna.phd.controller;
 
 import com.tuvarna.phd.dto.PhdDTO;
-import com.tuvarna.phd.exception.PhdException;
+import com.tuvarna.phd.exception.HttpException;
 import com.tuvarna.phd.service.PhdService;
 import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
@@ -63,7 +63,7 @@ public PhdController(PhdService phdService) {
                     schema = @Schema(implementation = PhdDTO.class))),
       })
   @Path("/login")
-  public Response login(PhdDTO pDto) throws PhdException {
+  public Response login(PhdDTO pDto) throws HttpException {
     // LOG.info("Received a request to login from using Phd user creds: " + pDto);
     // this.phdService.login(pDto);
 

src/main/java/com/tuvarna/phd/entity/Candidate.java

@@ -25,7 +25,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Table(name = "candidate")
-public non-sealed class Candidate extends PanacheEntityBase implements UserEntity<Candidate> {
+public non-sealed class Candidate extends PanacheEntityBase implements IUserEntity<Candidate> {
 
   @Id
   @SequenceGenerator(

src/main/java/com/tuvarna/phd/entity/Committee.java

@@ -24,7 +24,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Table(name = "committee")
-public non-sealed class Committee extends PanacheEntityBase implements UserEntity<Committee> {
+public non-sealed class Committee extends PanacheEntityBase implements IUserEntity<Committee> {
 
   @Id
   @SequenceGenerator(

src/main/java/com/tuvarna/phd/entity/DoctoralCenter.java

@@ -26,7 +26,7 @@
 // @UserDefinition
 @Table(name = "doctoralcenter")
 public non-sealed class DoctoralCenter extends PanacheEntityBase
-    implements UserEntity<DoctoralCenter> {
+    implements IUserEntity<DoctoralCenter> {
 
   @Id
   @SequenceGenerator(

src/main/java/com/tuvarna/phd/entity/UserEntity.java → src/main/java/com/tuvarna/phd/entity/IUserEntity.java

@@ -2,7 +2,7 @@
 
 import io.vertx.mutiny.sqlclient.Row;
 
-public sealed interface UserEntity<T extends UserEntity<T>>
+public sealed interface IUserEntity<T extends IUserEntity<T>>
     permits Phd, Committee, DoctoralCenter, UnauthorizedUsers, Candidate, Supervisor {
 
   T toEntity(Row row);

src/main/java/com/tuvarna/phd/entity/Phd.java

@@ -26,7 +26,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Table(name = "phd")
-public non-sealed class Phd extends PanacheEntityBase implements UserEntity<Phd> {
+public non-sealed class Phd extends PanacheEntityBase implements IUserEntity<Phd> {
 
   @Id
   @SequenceGenerator(name = "phdSequence", sequenceName = "phd_id_seq", allocationSize = 1)

src/main/java/com/tuvarna/phd/entity/Supervisor.java

@@ -24,7 +24,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Table(name = "supervisor")
-public non-sealed class Supervisor extends PanacheEntityBase implements UserEntity<Supervisor> {
+public non-sealed class Supervisor extends PanacheEntityBase implements IUserEntity<Supervisor> {
 
   @Id
   @SequenceGenerator(

src/main/java/com/tuvarna/phd/entity/UnauthorizedUsers.java

@@ -22,7 +22,7 @@
 @AllArgsConstructor
 @Table(name = "unauthorizedusers")
 public non-sealed class UnauthorizedUsers extends PanacheEntityBase
-    implements UserEntity<UnauthorizedUsers> {
+    implements IUserEntity<UnauthorizedUsers> {
 
   @Id
   @SequenceGenerator(
@@ -49,6 +49,13 @@ public non-sealed class UnauthorizedUsers extends PanacheEntityBase
   @Column(nullable = false, unique = false)
   private Boolean isAllowed = false;
 
+  public UnauthorizedUsers(String oid, String name, String email, Timestamp timestamp) {
+    this.oid = oid;
+    this.name = name;
+    this.email = email;
+    this.timestamp = timestamp;
+  }
+
   @Override
   public UnauthorizedUsers toEntity(Row row) {
     return new UnauthorizedUsers();

src/main/java/com/tuvarna/phd/exception/handler/ControllerExceptionMapper.java → src/main/java/com/tuvarna/phd/exception/ControllerExceptionMapper.java

@@ -1,8 +1,7 @@
-package com.tuvarna.phd.exception.handler;
+package com.tuvarna.phd.exception;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.tuvarna.phd.controller.ControllerResponse;
-import com.tuvarna.phd.exception.HttpException;
 import io.quarkus.security.ForbiddenException;
 import io.quarkus.security.UnauthorizedException;
 import jakarta.annotation.Priority;
@@ -23,11 +22,7 @@ public class ControllerExceptionMapper implements ExceptionMapper<Exception> {
   @Override
   public Response toResponse(Exception exception) {
     Response response = mapExceptionToResponse(exception);
-    log.error(
-        "Error with exception: "
-            + exception.getClass()
-            + " with message: "
-            + exception.getMessage());
+    log.error("Exception: " + exception.getClass() + " with message: " + exception.getMessage());
 
     return Response.fromResponse(response).type(MediaType.APPLICATION_JSON).build();
   }

src/main/java/com/tuvarna/phd/exception/HttpException.java

@@ -3,28 +3,16 @@
 import lombok.Getter;
 
 @Getter
-public abstract sealed class HttpException extends RuntimeException
-    permits BlobException,
-        SupervisorException,
-        SubjectException,
-        FacultyException,
-        ReportException,
-        GradeException,
-        CurriculumException,
-        CandidateException,
-        CommitteeException,
-        DoctoralCenterException,
-        DoctoralCenterRoleException,
-        IPBlockException,
-        LogException,
-        NotificationException,
-        PhdException,
-        S3ClientException,
-        UserException {
+public class HttpException extends RuntimeException {
   private final int status;
 
-  protected HttpException(String message, int status) {
+  public HttpException(String message, int status) {
     super(message);
     this.status = status;
   }
+
+  public HttpException(String message) {
+    super(message);
+    this.status = 400;
+  }
 }