Skip to content

Implemented builder pattern in Authentication and Flight IT classes. #23 #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2024
Merged

Implemented builder pattern in Authentication and Flight IT classes. #23 #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/com/projects/aeroplannerrestapi/constants/SecurityRoleConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ private SecurityRoleConstants() {
public static final String AUTHORIZATION = "Authorization";

public static final String SUPER_ADMIN = "SUPER_ADMIN";
public static final String ADMIN = "ADMIN";
public static final String USER = "USER";
public static final String IS_AUTHENTICATED = "isAuthenticated()";
public static final String USER_ROLE_AUTHORIZATION = "hasRole('USER')";
public static final String ADMIN_ROLE_AUTHORIZATION = "hasRole('ADMIN')";
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/projects/aeroplannerrestapi/dto/request/FlightRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.PositiveOrZero;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.*;

import java.math.BigDecimal;

@Getter
@Setter
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class FlightRequest {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/projects/aeroplannerrestapi/dto/request/LoginRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

@Getter
@Setter
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class LoginRequest {
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/projects/aeroplannerrestapi/dto/request/RegisterRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.*;

@Getter
@Setter
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class RegisterRequest {
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/projects/aeroplannerrestapi/entity/Flight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@

import com.projects.aeroplannerrestapi.enums.FlightStatusEnum;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.*;

import java.math.BigDecimal;
import java.time.Duration;

@Getter
@Setter
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Entity
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/projects/aeroplannerrestapi/entity/Role.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@

import com.projects.aeroplannerrestapi.enums.RoleEnum;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.*;

import java.util.Set;

@Getter
@Setter
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Entity
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/projects/aeroplannerrestapi/entity/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package com.projects.aeroplannerrestapi.entity;

import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.security.core.GrantedAuthority;
Expand All @@ -18,6 +15,7 @@

@Getter
@Setter
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Entity
Expand Down
103 changes: 55 additions & 48 deletions src/test/java/com/projects/aeroplannerrestapi/controller/AuthenticationControllerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,18 @@
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import org.springframework.test.web.servlet.result.MockMvcResultHandlers;

import java.util.HashSet;
import java.util.Set;

import static com.projects.aeroplannerrestapi.constants.OpenApiConstants.LOGGED_OUT_SUCCESSFULLY;
import static com.projects.aeroplannerrestapi.constants.PathConstants.*;
import static com.projects.aeroplannerrestapi.constants.SecurityRoleConstants.AUTHORIZATION;
import static com.projects.aeroplannerrestapi.constants.SecurityRoleConstants.BEARER;
import static com.projects.aeroplannerrestapi.util.TestConstants.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;

@AutoConfigureMockMvc
@ActiveProfiles("integration")
@ActiveProfiles(INTEGRATION)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class AuthenticationControllerIT extends AbstractContainerBaseTest {

Expand Down Expand Up @@ -63,100 +67,103 @@ public class AuthenticationControllerIT extends AbstractContainerBaseTest {

private String password;

private Role savedRole;

@BeforeEach
public void setup() {
fullName = "full name";
email = "sample@email.com";
password = "Password@123!";

userRepository.deleteAll();
roleRepository.deleteAll();

Role role = Role.builder()
.name(RoleEnum.USER)
.description(DEFAULT_USER_ROLE)
.build();
savedRole = roleRepository.save(role);

fullName = FULL_NAME;
email = VALID_EMAIL_ADDRESS;
password = VALID_PASSWORD;
}

@Test
public void givenRegisterRequest_whenRegister_thenReturnRegisteredUser() throws Exception {
// given
RegisterRequest registerRequest = new RegisterRequest();
registerRequest.setFullName(fullName);
registerRequest.setEmail(email);
registerRequest.setPassword(passwordEncoder.encode(password));
Role role = new Role();
role.setName(RoleEnum.USER);
role.setDescription("Default user role");
roleRepository.save(role);
RegisterRequest registerRequest = RegisterRequest.builder()
.fullName(fullName)
.email(email)
.password(password)
.build();

// when
ResultActions resultActions = mockMvc.perform(post("/api/v1/auth/register")
ResultActions resultActions = mockMvc.perform(post(API_V1_AUTH.concat(REGISTER))
.contentType(MediaType.APPLICATION_JSON)
.content(objectMapper.writeValueAsString(registerRequest)));

// then
resultActions.andDo(MockMvcResultHandlers.print())
.andExpect(status().isCreated())
.andExpect(jsonPath("$.email").value(registerRequest.getEmail()))
.andExpect(jsonPath("$.fullName").value(registerRequest.getFullName()));
.andExpect(jsonPath(EMAIL_PATH).value(registerRequest.getEmail()))
.andExpect(jsonPath(FULL_NAME_PATH).value(registerRequest.getFullName()));
}

@Test
public void givenLoginRequest_whenAuthenticate_thenReturnLoginResponse() throws Exception {
// given
User user = new User();
user.setFullName(fullName);
user.setEmail(email);
user.setPassword(passwordEncoder.encode(password));
Role role = new Role();
role.setName(RoleEnum.USER);
role.setDescription("Default user role");
Role savedRole = roleRepository.save(role);
user.setRoles(Set.of(savedRole));
User user = User.builder()
.fullName(fullName)
.email(email)
.password(passwordEncoder.encode(password))
.roles(Set.of(savedRole))
.build();
userRepository.save(user);

LoginRequest loginRequest = new LoginRequest();
loginRequest.setEmail(email);
loginRequest.setPassword(password);
LoginRequest loginRequest = LoginRequest.builder()
.email(email)
.password(password)
.build();

authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(email, password));
User savedUser = userRepository.findByEmail(email).get();
String token = jwtService.generateToken(savedUser);

User foundUser = userRepository.findByEmail(email).get();
String token = jwtService.generateToken(foundUser);
long expirationTime = jwtService.getExpirationTime();

// when
ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.post("/api/v1/auth/login")
ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.post(API_V1_AUTH.concat(LOGIN))
.contentType(MediaType.APPLICATION_JSON)
.content(objectMapper.writeValueAsString(loginRequest)));

// then
resultActions.andDo(MockMvcResultHandlers.print())
.andExpect(status().isOk())
.andExpect(jsonPath("$.token").value(token))
.andExpect(jsonPath("$.expiredIn").value(expirationTime));
.andExpect(jsonPath(TOKEN_PATH).value(token))
.andExpect(jsonPath(EXPIRED_IN_PATH).value(expirationTime));
}

@Test
public void givenHttServletRequest_whenLogout_thenReturnSuccessMessage() throws Exception {
// given
User user = new User();
user.setFullName(fullName);
user.setEmail(email);
user.setPassword(passwordEncoder.encode(password));
Role role = new Role();
role.setName(RoleEnum.USER);
role.setDescription("Default user role");
Role savedRole = roleRepository.save(role);
user.setRoles(Set.of(savedRole));
User user = User.builder()
.fullName(fullName)
.email(email)
.password(passwordEncoder.encode(password))
.roles(Set.of(savedRole))
.build();
userRepository.save(user);

authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(email, password));
User savedUser = userRepository.findByEmail(email).get();
String token = jwtService.generateToken(savedUser);

User foundUser = userRepository.findByEmail(email).get();
String token = jwtService.generateToken(foundUser);

// when
ResultActions resultActions = mockMvc.perform(post("/api/v1/auth/logout")
ResultActions resultActions = mockMvc.perform(post(API_V1_AUTH.concat(LOGOUT))
.contentType(MediaType.APPLICATION_JSON)
.header("Authorization", "Bearer " + token));
.header(AUTHORIZATION, BEARER + token));

// then
resultActions.andDo(MockMvcResultHandlers.print())
.andExpect(status().isOk())
.andExpect(content().string("Logged out successfully"));
.andExpect(content().string(LOGGED_OUT_SUCCESSFULLY));
}
}
Loading
Loading