Basic functionality. Register and Logging

Author: DaniilSnitko2002

pom.xml

@@ -45,6 +45,7 @@
 <version>${springdoc.version}</version>
 </dependency>
 
+<!-- Utils-->
 <dependency>
 <groupId>org.projectlombok</groupId>
 <artifactId>lombok</artifactId>
@@ -59,6 +60,7 @@
 <scope>provided</scope>
 </dependency>
 
+<!-- Database-->
 <dependency>
 <groupId>com.h2database</groupId>
 <artifactId>h2</artifactId>

src/main/java/com/springboot/msauthenticationservice/controller/UserApi.java

@@ -7,7 +7,6 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import jakarta.validation.Valid;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,7 +16,7 @@ public interface UserApi {
 
  /*
  * Sign up user
- * @Return no content
+ * @Return user id
  */
  @Operation(summary = "Sign Up User", description = "Signing up a user in the application", tags = {"User"})
  @ApiResponses(value ={
@@ -42,6 +41,6 @@ public interface UserApi {
  @ApiResponse(responseCode = "400", description = "Bad Request"),
  @ApiResponse(responseCode = "405", description = "Method Not Allowed")
  })
- @GetMapping(value = "/log_in", produces = {"application/json"})
- ResponseEntity<String> logInUserView(LogInDto logInDto);
+ @PostMapping(value = "/log_in", produces = {"application/json"})
+ ResponseEntity<LogInDto> logInUserView(@Valid @RequestBody LogInDto logInDto);
 }

src/main/java/com/springboot/msauthenticationservice/controller/impl/UserApiController.java

@@ -5,10 +5,12 @@
 import com.springboot.msauthenticationservice.dto.SignUpDto;
 import com.springboot.msauthenticationservice.service.UserService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.net.URI;
+
 /**
  * The Api User
  */
@@ -26,25 +28,29 @@ public UserApiController(UserService userService){
  this.userService = userService;
  }
 
+ /**
+ * Signing up a user
+ * @param signUpDto the dto
+ * @return the response entity
+ */
  @Override
  public ResponseEntity<String> signUpUserView(SignUpDto signUpDto) {
- try {
+ var savedUser = this.userService.signUpUser(signUpDto);
+ return ResponseEntity.created(URI.create(
+ "/user/".concat(savedUser.getId().toString())))
+ .contentType(MediaType.APPLICATION_JSON).body("Id: ".concat(savedUser.getId().toString()));
 
- var value = this.userService.signUpUserView(signUpDto);
- return ResponseEntity.ok(value);
- }catch (Exception e){
- return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
- }
  }
 
+ /**
+ * Logging a user
+ * @param logInDto the dto
+ * @return the response entity
+ */
  @Override
- public ResponseEntity<String> logInUserView(LogInDto logInDto) {
- try {
- var value = this.userService.logInUserView(logInDto);
-
+ public ResponseEntity<LogInDto> logInUserView(LogInDto logInDto) {
+ var value = this.userService.logInUser(logInDto);
  return ResponseEntity.ok(value);
- }catch (Exception e){
- return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
- }
+
  }
 }

src/main/java/com/springboot/msauthenticationservice/dto/LogInDto.java

@@ -1,27 +1,56 @@
 package com.springboot.msauthenticationservice.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 
+import java.util.UUID;
 
-@Builder
-@Getter
-@Setter
-@ToString
+
+@Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class LogInDto {
  /**
+ * Only sent in the api REQUEST
  * The email
  */
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
  @Email(message = "should be of type email")
  @NotNull
- public String email;
+ private String email;
 
  /**
+ * Only sent in the api REQUEST
  * The password
  */
  @NotNull
- public String password;
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+ private String password;
+
+ /**
+ * Only sent in the api RESPONSE
+ * The username
+ */
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String username;
+
+ /**
+ * Only sent in the api RESPONSE
+ * The id
+ */
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private UUID id;
+
+ public String getEmail(){
+ return this.email;
+ }
+
+ public String getPassword(){
+ return this.password;
+ }
 }

src/main/java/com/springboot/msauthenticationservice/dto/SignUpDto.java

@@ -5,14 +5,18 @@
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 
-@Builder
-@Getter
-@Setter
-@ToString
+import java.util.UUID;
+
+
+@Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class SignUpDto {
 
+ /**
+ * The id
+ */
+ private UUID id;
  /**
  * The username
  */
@@ -30,4 +34,12 @@ public class SignUpDto {
  */
  @NotNull
  private String password;
+
+ public UUID getId(){
+ return this.id;
+ }
+
+ public String getEmail() {
+ return this.email;
+ }
 }

src/main/java/com/springboot/msauthenticationservice/entity/User.java

@@ -1,13 +1,12 @@
 package com.springboot.msauthenticationservice.entity;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import lombok.*;
+import org.hibernate.annotations.GenericGenerator;
 
 import java.io.Serializable;
+import java.util.UUID;
 
 @Builder
 @NoArgsConstructor
@@ -21,16 +20,17 @@ public class User implements Serializable {
  * The id
  */
  @Id
-// @GeneratedValue(generator = "USERS_ID_SEQ")
-// @GenericGenerator(name = "USERS_ID_SEQ", strategy = "org.hibernate.id.UUIDGenerator")
+ @GeneratedValue(generator = "USERS_ID_SEQ")
+ @GenericGenerator(name = "USERS_ID_SEQ", strategy = "org.hibernate.id.UUIDGenerator")
  @Column(name = "id")
- private String id;
+ private UUID id;
 
  /**
  * The name
  */
  @NotBlank(message = "Name is mandatory")
- private String name;
+ @Column(name = "name")
+ private String username;
 
  /**
  * The email

src/main/java/com/springboot/msauthenticationservice/mapper/UserMapper.java

@@ -0,0 +1,31 @@
+package com.springboot.msauthenticationservice.mapper;
+
+import com.springboot.msauthenticationservice.dto.LogInDto;
+import com.springboot.msauthenticationservice.dto.SignUpDto;
+import com.springboot.msauthenticationservice.entity.User;
+
+public interface UserMapper {
+
+ /**
+ * Map SignUpDto
+ * @param user the user
+ * @return the SignUpDeto
+ */
+ SignUpDto mapSignUp(User user);
+
+ /**
+ * Map User
+ * @param signUpDto the SignUpDto
+ * @return the user
+ */
+ User mapSignUp(SignUpDto signUpDto);
+
+
+ /**
+ * Map LogInDto
+ * @param user the user
+ * @return the LogInDto
+ */
+ LogInDto mapLogIn(User user);
+
+}

src/main/java/com/springboot/msauthenticationservice/mapper/impl/UserMapperImpl.java

@@ -0,0 +1,43 @@
+package com.springboot.msauthenticationservice.mapper.impl;
+
+import com.springboot.msauthenticationservice.dto.LogInDto;
+import com.springboot.msauthenticationservice.dto.SignUpDto;
+import com.springboot.msauthenticationservice.entity.User;
+import com.springboot.msauthenticationservice.mapper.UserMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UserMapperImpl implements UserMapper {
+ @Override
+ public SignUpDto mapSignUp(User user) {
+ if(user == null) {
+ return null;
+ }
+ var signUpDto = new SignUpDto();
+ BeanUtils.copyProperties(user,signUpDto);
+ return signUpDto;
+ }
+
+ @Override
+ public User mapSignUp(SignUpDto signUpDto) {
+ if(signUpDto == null) {
+ return null;
+ }
+
+ var user = new User();
+ BeanUtils.copyProperties(signUpDto, user);
+ return user;
+ }
+
+ @Override
+ public LogInDto mapLogIn(User user) {
+ if(user == null) {
+ return null;
+ }
+ var logInDto = new LogInDto();
+ BeanUtils.copyProperties(user,logInDto);
+ return logInDto;
+ }
+
+}

src/main/java/com/springboot/msauthenticationservice/repository/UserRepository.java

@@ -9,15 +9,21 @@
 /**
  * User Repository
  */
-
 @Repository
 public interface UserRepository extends JpaRepository<User, String> {
 
  /**
  * Logging user
- * @param email
- * @param password
- * @return
+ * @param email the email
+ * @param password the password
+ * @return the optional
+ */
+ Optional<User> findByEmailIgnoreCaseAndPassword(String email, String password);
+
+ /**
+ * Find a user by email
+ * @param email the email
+ * @return the optional
  */
- Optional<User> findByEmailAndPassword(String email, String password);
+ Optional<User> findByEmail(String email);
 }

src/main/java/com/springboot/msauthenticationservice/service/UserService.java

@@ -3,11 +3,9 @@
 import com.springboot.msauthenticationservice.dto.LogInDto;
 import com.springboot.msauthenticationservice.dto.SignUpDto;
 
-import java.io.IOException;
-
 public interface UserService {
- String signUpUserView (SignUpDto signUpDto) throws IOException;
+ SignUpDto signUpUser (SignUpDto signUpDto);
 
- String logInUserView (LogInDto logInDto) throws IOException;
+ LogInDto logInUser (LogInDto logInDto);
 
 }