- Created Google SignUp

- Added isGoogleUser variable at User entity
- Wrote 2 test case for user controller to check CI/CD

Author: ivikashgorai

.github/workflows/deploy.yml

@@ -0,0 +1,29 @@
+name: CI/CD Pipeline
+
+on:
+  push:
+    branches:
+      - test
+
+jobs:
+  build-deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: Build with Maven
+        run: mvn clean install
+
+      - name: Run Tests
+        run: mvn test
+
+      - name: Trigger Render Deploy
+        run: curl -X POST https://api.render.com/deploy/srv-d1lspd2li9vc73eb65e0?key=BKlQTrnxze4

src/main/java/com/hrms/backend/controllers/AuthenticationController.java

@@ -5,18 +5,23 @@
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.gson.GsonFactory;
 import com.hrms.backend.dtos.entityDtos.LoginSignUp.GoogleLoginRequest;
+import com.hrms.backend.dtos.entityDtos.LoginSignUp.GoogleSignUpRequest;
 import com.hrms.backend.dtos.entityDtos.LoginSignUp.JwtRequest;
 import com.hrms.backend.dtos.entityDtos.LoginSignUp.JwtResponse;
 import com.hrms.backend.dtos.entityDtos.User.response.UserResponseDto;
+import com.hrms.backend.exceptions.BadApiRequestException;
 import com.hrms.backend.exceptions.ResourceNotFoundException;
+import com.hrms.backend.models.Company;
 import com.hrms.backend.models.User;
 import com.hrms.backend.models.enums.Role;
+import com.hrms.backend.repositories.CompanyRepository;
 import com.hrms.backend.repositories.UserRepository;
 import com.hrms.backend.security.JwtHelper;
+import com.hrms.backend.utils.CodeGenerator;
+import jakarta.validation.Valid;
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -29,6 +34,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Collections;
+import java.util.Optional;
 
 @RestController
 @RequestMapping("/auth")
@@ -52,6 +58,9 @@ public class AuthenticationController {
     @Autowired
     private UserDetailsService userDetailsService;
 
+    @Autowired
+    private CompanyRepository companyRepository;
+
     @Value("${web.client.id}")
     private String webClientId;
 
@@ -114,4 +123,67 @@ public ResponseEntity<JwtResponse> googleLogin(@RequestBody GoogleLoginRequest r
 
         return ResponseEntity.ok(jwtResponse);
     }
+
+    @PostMapping("/googleSignUp")
+    public ResponseEntity<JwtResponse> googleSignUp(@Valid @RequestBody GoogleSignUpRequest request) {
+        String idTokenString = request.getIdToken();
+
+        GoogleIdTokenVerifier verifier = new GoogleIdTokenVerifier.Builder(new NetHttpTransport(), new GsonFactory())
+                .setAudience(Collections.singletonList(webClientId)) // Your Google Web Client ID
+                .build();
+
+        GoogleIdToken idToken;
+        try {
+            idToken = verifier.verify(idTokenString);
+        } catch (Exception e) {
+            throw new ResourceNotFoundException("Invalid Google ID token");
+        }
+
+        if (idToken == null) {
+            throw new ResourceNotFoundException("Invalid Google ID token");
+        }
+
+        GoogleIdToken.Payload payload = idToken.getPayload();
+        String email = payload.getEmail();
+
+        Optional<User> existingUser = userRepository.findByEmail(email);
+
+        if (existingUser.isPresent()) {
+            throw new BadApiRequestException("User already registered with this email");
+        }
+
+        // Create new user
+        User newUser = User.builder()
+                .email(email)
+                .name((String) payload.get("name"))
+                .imageUrl((String) payload.get("picture"))
+                .role(Role.valueOf(request.getRole())) // Ensure enum matches (ROLE_USER or ROLE_HR)
+                .isGoogleUser(true)
+                .build();
+
+        if(newUser.getRole().equals(Role.ROLE_HR)){
+            String companyCode = CodeGenerator.generateBase64Code();;
+            while(companyRepository.findByCompanyCode(companyCode).isPresent()){
+                companyCode = CodeGenerator.generateBase64Code();
+            }
+            newUser.setCompanyCode(companyCode);
+        }
+
+
+        User savedUser = userRepository.save(newUser);
+
+        Company company = Company.builder().hr(savedUser.getId()).companyCode(savedUser.getCompanyCode()).build();
+        companyRepository.save(company);
+
+        String jwt = jwtHelper.generateToken(savedUser, savedUser.getRole().name());
+        UserResponseDto userResponseDto = modelMapper.map(savedUser, UserResponseDto.class);
+
+        JwtResponse jwtResponse = JwtResponse.builder()
+                .user(userResponseDto)
+                .token(jwt)
+                .build();
+
+        return ResponseEntity.ok(jwtResponse);
+    }
+
 }

src/main/java/com/hrms/backend/controllers/PingController.java

@@ -1,13 +1,11 @@
 package com.hrms.backend.controllers;
 
-import com.hrms.backend.dtos.entityDtos.User.response.UserResponseDto;
 import com.hrms.backend.dtos.response_message.SuccessApiResponseMessage;
 import com.hrms.backend.security.JwtHelper;
 import com.hrms.backend.services.userService.UserServiceInterface;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

src/main/java/com/hrms/backend/controllers/UserController.java

@@ -13,11 +13,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-@Validated
 @RestController
 @RequestMapping("/users")
 public class UserController {

src/main/java/com/hrms/backend/dtos/entityDtos/LoginSignUp/GoogleLoginRequest.java

@@ -2,7 +2,6 @@
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
 import lombok.*;
 
 @Setter
@@ -11,5 +10,7 @@
 @AllArgsConstructor
 @Builder
 public class GoogleLoginRequest {
+    @NotNull(message = "token is required")
+    @NotBlank(message = "token cannot be empty")
     private String idToken;
 }

src/main/java/com/hrms/backend/dtos/entityDtos/LoginSignUp/GoogleSignUpRequest.java

@@ -0,0 +1,25 @@
+package com.hrms.backend.dtos.entityDtos.LoginSignUp;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import lombok.*;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class GoogleSignUpRequest {
+
+    @NotNull(message = "token is required")
+    @NotBlank(message = "token cannot be empty")
+    private String idToken;
+    @NotBlank(message = "Role is required")
+    @Pattern(
+            regexp = "ROLE_USER|ROLE_HR",
+            message = "Role must be one of: ROLE_USER, or ROLE_HR"
+    )
+    private String role;
+}

src/main/java/com/hrms/backend/models/User.java

@@ -30,10 +30,14 @@ public class User implements UserDetails {
 
     private String email;
 
+    @Field(write = Field.Write.ALWAYS)
     private String phone;
 
+    @Field(write = Field.Write.ALWAYS)
     private String password;
 
+    private Boolean isGoogleUser = false;
+
     @Field(write = Field.Write.ALWAYS)
     private String gender;
 

src/test/java/com/hrms/backend/User/UserControllerTests.java

@@ -0,0 +1,78 @@
+package com.hrms.backend.User;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.hrms.backend.controllers.UserController;
+import com.hrms.backend.dtos.entityDtos.User.request.UserUpdateProfileRequestDto;
+import com.hrms.backend.dtos.entityDtos.User.response.UserResponseDto;
+import com.hrms.backend.security.JwtHelper;
+import com.hrms.backend.services.userService.UserServiceInterface;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.http.MediaType;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+class UserControllerTests {
+
+    private MockMvc mockMvc;
+    private final UserServiceInterface userService = mock(UserServiceInterface.class);
+    private final JwtHelper jwtHelper = mock(JwtHelper.class);
+    private final ObjectMapper objectMapper = new ObjectMapper();
+    private final String token = "Bearer valid.jwt.token";
+
+    @BeforeEach
+    void setUp() {
+        UserController userController = new UserController();
+        ReflectionTestUtils.setField(userController, "userServiceInterface", userService);
+        ReflectionTestUtils.setField(userController, "jwtHelper", jwtHelper);
+        this.mockMvc = MockMvcBuilders.standaloneSetup(userController).build();
+    }
+
+
+    @Test
+    void getUserProfile_shouldReturn200() throws Exception {
+        String userId = "u123";
+        UserResponseDto response = new UserResponseDto();
+        response.setId(userId);
+        response.setEmail("[email protected]");
+
+        when(jwtHelper.getUserIdFromToken("valid.jwt.token")).thenReturn(userId);
+        when(userService.getUserById(userId)).thenReturn(response);
+
+        mockMvc.perform(get("/users")
+                        .header("Authorization", token))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.id").value(userId));
+    }
+
+    @Test
+    void updateProfile_shouldReturn202() throws Exception {
+        String userId = "u123";
+        UserUpdateProfileRequestDto request = new UserUpdateProfileRequestDto();
+        request.setName("Jane Doe");
+
+        UserResponseDto response = new UserResponseDto();
+        response.setId(userId);
+        response.setName("Jane Doe");
+
+        when(jwtHelper.getUserIdFromToken("valid.jwt.token")).thenReturn(userId);
+        when(userService.updateUser(any(), eq(userId))).thenReturn(response);
+
+        mockMvc.perform(patch("/users")
+                        .header("Authorization", token)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(request)))
+                .andExpect(status().isAccepted())
+                .andExpect(jsonPath("$.name").value("Jane Doe"));
+    }
+}