Merge branch 'main' into tests/issue-#103-integration-tests-for-SignUpResource

Author: omatheusmesmo

.github/workflows/pipeline.yml

@@ -15,11 +15,11 @@ concurrency:
 
 jobs:
   timeless-api:
-    name: Build & Test - Timeless API (Java)
+    name: Build & Publish - Timeless API (Java)
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./timeless-api        
+        working-directory: timeless-api        
 
     steps:
       - name: Checkout
@@ -54,17 +54,28 @@ jobs:
       - name: Ensure Maven wrapper is executable
         run: chmod +x mvnw
 
+      - name: Set up Podman
+        uses: gacts/install-podman@v1
+        id: podman
+
+      - name: Login to Quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+
       - name: Build with unit and integration tests
-        run: ./mvnw -B -ntp formatter:validate impsort:check package
+        run: mvn -B -ntp formatter:validate impsort:check package -Dquarkus.container-image.build=true -Dquarkus.container-image.registry=quay.io -Dquarkus.container-image.group=timeless -Dquarkus.container-image.name=timeless-api -Dquarkus.container-image.tag=${{ github.sha }}
         env:
           CHROME_BIN: ${{ steps.chrome.outputs.chrome-path }}
 
   whatsapp:
-    name: Lint - WhatsApp
+    name: Build & Publish - WhatsApp
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./whatsapp
+        working-directory: whatsapp
 
     steps:
       - name: Checkout
@@ -83,4 +94,21 @@ jobs:
       - name: Check code formatting with Prettier
         run: npm run prettier:check
 
+      - name: Install pack CLI
+        uses: buildpacks/github-actions/[email protected]
 
+      - name: Login to Quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+
+      - name: Build and publish WhatsApp image with Buildpacks
+        run: |
+          pack build quay.io/timeless/whatsapp:${{ github.sha }} \
+            --path whatsapp \
+            --builder paketobuildpacks/builder-jammy-base \
+            --buildpack paketo-community/apt \
+            --buildpack paketo-buildpacks/nodejs \
+            --publish

timeless-api/pom.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>dev.matheuscruz</groupId>
     <artifactId>timeless-api</artifactId>
@@ -14,10 +12,10 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.30.2</quarkus.platform.version>
+        <quarkus.platform.version>3.30.3</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.5.4</surefire-plugin.version>
-        <quarkus-quinoa.version>2.7.0</quarkus-quinoa.version>
+        <quarkus-quinoa.version>2.7.1</quarkus-quinoa.version>
         <jbcrypt.version>0.4</jbcrypt.version>
         <quarkus-langchain4j-openai.version>1.4.2</quarkus-langchain4j-openai.version>
         <assertj.version>3.27.6</assertj.version>
@@ -107,6 +105,10 @@
             <artifactId>quarkus-scheduler</artifactId>
         </dependency>
         <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-buildpack</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -173,9 +175,7 @@
                 </executions>
                 <configuration>
                     <systemPropertyVariables>
-                        <native.image.path>
-                            ${project.build.directory}/${project.build.finalName}-runner
-                        </native.image.path>
+                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
                         <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>

timeless-api/src/main/java/dev/matheuscruz/domain/User.java

@@ -32,20 +32,29 @@ public class User {
     @Column(unique = true, name = "phone_number")
     private String phoneNumber;
 
-    public static User create(String email, String password, String firstName, String lastName) {
+    public static User create(String email, String password, String firstName, String lastName, String phoneNumber) {
         return new User(Objects.requireNonNull(email), Objects.requireNonNull(password),
-                Objects.requireNonNull(firstName), Objects.requireNonNull(lastName));
+                Objects.requireNonNull(firstName), Objects.requireNonNull(lastName),
+                Objects.requireNonNull(phoneNumber));
+    }
+
+    public void update(String firstName, String lastName, String email, String phoneNumber) {
+        this.firstName = Objects.requireNonNull(firstName);
+        this.lastName = Objects.requireNonNull(lastName);
+        this.email = Objects.requireNonNull(email);
+        this.phoneNumber = Objects.requireNonNull(phoneNumber);
     }
 
     protected User() {
     }
 
-    private User(String email, String password, String firstName, String lastName) {
+    private User(String email, String password, String firstName, String lastName, String phoneNumber) {
         this.id = UUID.randomUUID().toString();
         this.email = email;
         this.password = password;
         this.firstName = firstName;
         this.lastName = lastName;
+        this.phoneNumber = phoneNumber;
     }
 
     public String getId() {
@@ -79,8 +88,4 @@ public String fullName() {
     public void addPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
-
-    public Boolean hasPhoneNumber() {
-        return this.phoneNumber != null;
-    }
 }

timeless-api/src/main/java/dev/matheuscruz/presentation/SignInResource.java

@@ -41,13 +41,12 @@ public Response signIn(@Valid SignInRequest req) {
         String token = Jwt.upn(user.getId()).groups(Set.of(Groups.USER.groupName())).expiresIn(Duration.ofDays(1))
                 .sign();
 
-        return Response.ok(new SignInResponse(token, user.getId(), user.fullName(), req.email(), user.hasPhoneNumber()))
-                .build();
+        return Response.ok(new SignInResponse(token, user.getId(), user.fullName(), req.email())).build();
     }
 
     public record SignInRequest(@Email String email, @NotBlank @Size(min = 8, max = 32) String password) {
     }
 
-    public record SignInResponse(String token, String id, String name, String email, Boolean hasPhoneNumber) {
+    public record SignInResponse(String token, String id, String name, String email) {
     }
 }

timeless-api/src/main/java/dev/matheuscruz/presentation/SignUpResource.java

@@ -36,7 +36,8 @@ public Response signUp(@Valid SignUpRequest req) {
                     .entity(new Problem("Este nome de usuário já foi usado. Tente outro.")).build();
         }
 
-        User user = User.create(req.email(), BCryptAdapter.encrypt(req.password()), req.firstName(), req.lastName());
+        User user = User.create(req.email(), BCryptAdapter.encrypt(req.password()), req.firstName(), req.lastName(),
+                req.phoneNumber());
 
         QuarkusTransaction.requiringNew().run(() -> {
             this.userRepository.persist(user);
@@ -45,7 +46,7 @@ public Response signUp(@Valid SignUpRequest req) {
         return Response.status(Response.Status.CREATED).entity(new SignUpResponse(user.getId(), user.getEmail()))
                 .build();
     }
-
+  
     public record SignUpRequest(@NotBlank @Email String email, @NotBlank @Size(min = 8, max = 32) String password,
             @NotBlank String firstName, @NotBlank String lastName) {
     }

timeless-api/src/main/java/dev/matheuscruz/presentation/UserResource.java

@@ -7,7 +7,7 @@
 import jakarta.ws.rs.ForbiddenException;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.NotFoundException;
-import jakarta.ws.rs.PATCH;
+import jakarta.ws.rs.PUT;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.core.Response;
@@ -21,14 +21,14 @@ public UserResource(UserRepository userRepository) {
         this.userRepository = userRepository;
     }
 
-    @PATCH
+    @PUT
     @Transactional
-    public Response update(PatchUserRequest req) {
+    public Response update(UpdateUserRequest req) {
 
         User user = this.userRepository.find("id = :id", Parameters.with("id", req.id())).firstResultOptional()
                 .orElseThrow(NotFoundException::new);
 
-        user.addPhoneNumber(req.phoneNumber());
+        user.update(req.firstName(), req.lastName(), req.email(), req.phoneNumber());
 
         this.userRepository.persistAndFlush(user);
 
@@ -46,7 +46,7 @@ public Response getUserInfo(@PathParam("id") String userId) {
                 user.getFirstName(), user.getLastName(), user.getPhoneNumber() != null)).build();
     }
 
-    public record PatchUserRequest(String phoneNumber, String id) {
+    public record UpdateUserRequest(String firstName, String lastName, String email, String phoneNumber, String id) {
     }
 
     public record UserInfoResponse(String id, String email, String phoneNumber, String firstName, String lastName,