Merge pull request #34 from UPHRH-platform/UPHRH_7903_mobile_otp

Uphrh 7903 mobile otp

pom.xml

@@ -118,6 +118,7 @@
 			<artifactId>maven-artifact-manager</artifactId>
 			<version>2.2.1</version>
 		</dependency>
+
 	</dependencies>
 
 	<build>

src/main/java/org/upsmf/grievance/GrievanceServiceApplication.java

 package org.upsmf.grievance;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.velocity.app.VelocityEngine;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -7,12 +8,19 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.util.Date;
+import java.util.TimeZone;
+
 @SpringBootApplication
 @EnableScheduling
 @EnableJpaRepositories(basePackages = "org.upsmf.grievance")
+@Slf4j
 public class GrievanceServiceApplication {
 
 	public static void main(String[] args) {
+		TimeZone.setDefault(TimeZone.getTimeZone("GMT+5:30"));
+		log.info("Application time zone time is IST: " + new Date().toString());
+
 		SpringApplication.run(GrievanceServiceApplication.class, args);
 	}
 

src/main/java/org/upsmf/grievance/controller/OtpController.java

@@ -39,5 +39,19 @@ public class OtpController {
         }
     }
 
+    @PostMapping("/generate-mobile-otp")
+    public ResponseEntity<String> generateMobileOtp(@RequestBody OtpRequest otpRequest) {
+        otpService.generateAndSendMobileOtp(otpRequest);
+        return ResponseEntity.ok("OTP generated and sent successfully");
+    }
 
+    @PostMapping("/validate-mobile-otp")
+    public ResponseEntity<String> validateMobileOtp(@RequestBody OtpValidationRequest otpValidationRequest) {
+        boolean isValid = otpService.validateMobileOtp(otpValidationRequest.getPhone(), otpValidationRequest.getOtp());
+        if (isValid) {
+            return ResponseEntity.ok("OTP validation successful.");
+        } else {
+            return ResponseEntity.badRequest().body("Invalid OTP.");
+        }
+    }
 }

src/main/java/org/upsmf/grievance/controller/TicketController.java

 package org.upsmf.grievance.controller;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -8,11 +9,16 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.upsmf.grievance.dto.TicketRequest;
 import org.upsmf.grievance.dto.UpdateTicketRequest;
+import org.upsmf.grievance.exception.CustomException;
+import org.upsmf.grievance.exception.TicketException;
+import org.upsmf.grievance.exception.UserException;
 import org.upsmf.grievance.model.Ticket;
 import org.upsmf.grievance.model.reponse.Response;
 import org.upsmf.grievance.service.AttachmentService;
 import org.upsmf.grievance.service.TicketService;
+import org.upsmf.grievance.util.ErrorCode;
 
+@Slf4j
 @Controller
 @RequestMapping("/api/ticket")
 public class TicketController {
@@ -28,9 +34,12 @@ public class TicketController {
         Ticket responseTicket = null;
         try {
             responseTicket = ticketService.save(ticketRequest);
+        } catch (CustomException e) {
+            log.error("Error in while creating ticket - at controller");
+            throw new TicketException(e.getMessage(), ErrorCode.TKT_001, "Error while trying to create ticket");
         } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException(e.getMessage());
+            log.error("Internal server error while creating ticket", e);
+            throw new TicketException("Internal server error while creating ticket", ErrorCode.TKT_002, e.getMessage());
         }
         Response response = new Response(HttpStatus.OK.value(), responseTicket);
         return new ResponseEntity<Response>(response, HttpStatus.OK);

src/main/java/org/upsmf/grievance/controller/UserController.java

 package org.upsmf.grievance.controller;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -9,13 +10,16 @@ import org.springframework.web.bind.annotation.*;
 import org.upsmf.grievance.dto.CreateUserDto;
 import org.upsmf.grievance.dto.UpdateUserDto;
 import org.upsmf.grievance.dto.UserResponseDto;
+import org.upsmf.grievance.exception.CustomException;
+import org.upsmf.grievance.exception.UserException;
 import org.upsmf.grievance.model.Department;
 import org.upsmf.grievance.model.User;
 import org.upsmf.grievance.service.IntegrationService;
+import org.upsmf.grievance.util.ErrorCode;
 
 import java.util.*;
 
-
+@Slf4j
 @Controller
 @RequestMapping("/api/user")
 public class UserController {
@@ -38,14 +42,18 @@ public class UserController {
     @PostMapping("/create-user")
     public ResponseEntity createUser(@RequestBody CreateUserDto userRequest) {
         try {
-            ResponseEntity<User> user =  integrationService.createUser(userRequest);
-            if(user.getStatusCode() == HttpStatus.OK) {
+            ResponseEntity<User> user = integrationService.createUser(userRequest);
+            if (user.getStatusCode() == HttpStatus.OK) {
                 return createUserResponse(user.getBody());
             } else {
-                return ResponseEntity.internalServerError().build();
+                log.error("Error unable to create user - doesn't receive created user");
+                throw new UserException("Unable to create user", ErrorCode.USER_003, "Error while trying to create user");
             }
+        } catch (CustomException e) {
+            log.error("Error in while creating user - at controller");
+            throw new UserException(e.getMessage(), ErrorCode.USER_003, "Error while trying to create user");
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Error while creating user", e);
             return ResponseEntity.internalServerError().body(e.getLocalizedMessage());
         }
     }

src/main/java/org/upsmf/grievance/dto/TicketRequest.java

@@ -23,5 +23,6 @@ public class TicketRequest {
     private String description;
     private List<String> attachmentUrls;
     private String otp;
+    private String mobileOtp;
 
 }

src/main/java/org/upsmf/grievance/dto/UpdateTicketRequest.java

@@ -23,4 +23,5 @@ public class UpdateTicketRequest {
     private String comment;
     private List<String> assigneeAttachmentURLs;
     private Boolean isJunk;
+    private Boolean isNudged;
 }

src/main/java/org/upsmf/grievance/enums/RequesterType.java

@@ -2,7 +2,7 @@ package org.upsmf.grievance.enums;
 
 public enum RequesterType {
 
-    CANDIDATE(1), INSTITUTE(2), FACULTY(3), OTHERS(4);
+    CANDIDATE(1), INSTITUTE(2), FACULTY(3), OTHERS(4), PUBLIC(5);
 
     private int id;
     RequesterType(int id) {

src/main/java/org/upsmf/grievance/exception/CustomException.java

+package org.upsmf.grievance.exception;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.upsmf.grievance.util.ErrorCode;
+
+@Data
+@NoArgsConstructor
+public class CustomException extends RuntimeException {
+
+    private String description;
+
+    private ErrorCode errorCode;
+
+    public CustomException(String message) {
+        super(message);
+    }
+
+    public CustomException(String message, String description) {
+        super(message);
+        this.description = description;
+    }
+
+    public CustomException(String message, ErrorCode errorCode) {
+        super(message);
+        this.errorCode = errorCode;
+    }
+
+
+    public CustomException(String message, ErrorCode errorCode, String description) {
+        super(message);
+        this.description = description;
+        this.errorCode = errorCode;
+    }
+}

src/main/java/org/upsmf/grievance/exception/DataUnavailabilityException.java

+package org.upsmf.grievance.exception;
+
+import org.upsmf.grievance.util.ErrorCode;
+
+public class DataUnavailabilityException extends CustomException {
+
+    public DataUnavailabilityException(String message) {
+        super(message);
+    }
+
+    public DataUnavailabilityException(String message, String description) {
+        super(message, description);
+    }
+
+    public DataUnavailabilityException(String message, ErrorCode errorCode) {
+        super(message, errorCode);
+    }
+
+
+    public DataUnavailabilityException(String message, ErrorCode errorCode, String description) {
+        super(message, errorCode, description);
+    }
+}

src/main/java/org/upsmf/grievance/exception/OtpException.java

+package org.upsmf.grievance.exception;
+
+import org.upsmf.grievance.util.ErrorCode;
+
+public class OtpException extends CustomException {
+
+    public OtpException(String message) {
+        super(message);
+    }
+
+    public OtpException(String message, String description) {
+        super(message, description);
+    }
+
+    public OtpException(String message, ErrorCode errorCode) {
+        super(message, errorCode);
+    }
+
+
+    public OtpException(String message, ErrorCode errorCode, String description) {
+        super(message, errorCode, description);
+    }
+}

src/main/java/org/upsmf/grievance/exception/TicketException.java

+package org.upsmf.grievance.exception;
+
+import org.upsmf.grievance.util.ErrorCode;
+
+public class TicketException extends CustomException {
+
+    public TicketException(String message) {
+        super(message);
+    }
+
+    public TicketException(String message, String description) {
+        super(message, description);
+    }
+
+    public TicketException(String message, ErrorCode errorCode) {
+        super(message, errorCode);
+    }
+
+
+    public TicketException(String message, ErrorCode errorCode, String description) {
+        super(message, errorCode, description);
+    }
+}

src/main/java/org/upsmf/grievance/exception/UserException.java

+package org.upsmf.grievance.exception;
+
+import org.upsmf.grievance.util.ErrorCode;
+
+public class UserException extends CustomException {
+
+    public UserException(String message) {
+        super(message);
+    }
+
+    public UserException(String message, String description) {
+        super(message, description);
+    }
+
+    public UserException(String message, ErrorCode errorCode) {
+        super(message, errorCode);
+    }
+
+
+    public UserException(String message, ErrorCode errorCode, String description) {
+        super(message, errorCode, description);
+    }
+}

src/main/java/org/upsmf/grievance/exception/controller/ExceptionHandler4xxController.java

 package org.upsmf.grievance.exception.controller;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.upsmf.grievance.dto.ErrorResponseDto;
+import org.upsmf.grievance.exception.CustomException;
 import org.upsmf.grievance.exception.runtime.InvalidRequestException;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @ControllerAdvice
 public class ExceptionHandler4xxController {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionHandler4xxController.class);
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<Map<String, List<String>>> handleValidationErrors(MethodArgumentNotValidException exception) {
+
+        List<String> errors = exception.getBindingResult().getFieldErrors().stream()
+                .map(FieldError::getDefaultMessage)
+                .collect(Collectors.toList());
+
+        return new ResponseEntity<>(getErrorsMap(errors), new HttpHeaders(), HttpStatus.BAD_REQUEST);
+    }
+
     /**
      * Exception handler for Invalid request exception
      * @param e
@@ -21,4 +45,26 @@ public class ExceptionHandler4xxController {
         return new ErrorResponseDto(HttpStatus.BAD_REQUEST.value(), e.getMessage());
     }
 
+    @ExceptionHandler(CustomException.class)
+    public ResponseEntity<Map<String, Object>> handleNotFoundException(CustomException exception) {
+        return new ResponseEntity<>(generateErrorMap(exception), new HttpHeaders(), HttpStatus.BAD_REQUEST);
+    }
+
+
+    private Map<String, List<String>> getErrorsMap(List<String> errors) {
+        Map<String, List<String>> errorResponse = new HashMap<>();
+        errorResponse.put("errors", errors);
+        return errorResponse;
+    }
+
+    private Map<String, Object> generateErrorMap(CustomException exception) {
+        Map<String, Object> errorResponse = new HashMap<>();
+        String errorCode = exception.getErrorCode() != null ? exception.getErrorCode().name() : "NA";
+
+        errorResponse.put("error_code", errorCode);
+        errorResponse.put("error_message", exception.getMessage());
+        errorResponse.put("description", exception.getDescription());
+
+        return errorResponse;
+    }
 }

src/main/java/org/upsmf/grievance/model/OtpValidationRequest.java

@@ -12,4 +12,5 @@ public class OtpValidationRequest {
 
     private String email;
     private String otp;
+    private String phone;
 }

src/main/java/org/upsmf/grievance/model/Ticket.java

 package org.upsmf.grievance.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
@@ -49,9 +50,14 @@ public class Ticket {
     @Column(name = "is_junk")
     private boolean junk = false;
 
+    @Column(name = "junked_by")
+    private String junkedBy;
+
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.S", timezone = "Asia/Kolkata")
     @Column(name = "created_date")
     private Timestamp createdDate;
 
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.S", timezone = "Asia/Kolkata")
     @Column(name = "updated_date")
     private Timestamp updatedDate;
 
@@ -64,6 +70,7 @@ public class Ticket {
     @Column(name = "is_escalated_to_admin")
     private boolean escalatedToAdmin;
 
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.S", timezone = "Asia/Kolkata")
     @Column(name = "escalated_date")
     private Timestamp escalatedDate;
 
@@ -83,6 +90,9 @@ public class Ticket {
     @Column(name = "escalated_by")
     private String escalatedBy = "-1";
 
+    @Column(name = "reminder_counter")
+    private Long reminderCounter = 0L;
+
     @OneToMany(targetEntity = Comments.class, mappedBy = "ticketId", fetch = FetchType.EAGER)
     @Fetch(value = FetchMode.SUBSELECT)
     private List<Comments> comments;

src/main/java/org/upsmf/grievance/model/es/Ticket.java

 package org.upsmf.grievance.model.es;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
@@ -8,6 +9,8 @@ import org.upsmf.grievance.enums.RequesterType;
 import org.upsmf.grievance.enums.TicketPriority;
 import org.upsmf.grievance.enums.TicketStatus;
 
+import javax.persistence.Column;
+
 @Document(indexName = "ticket", createIndex = false)
 @Getter
 @Setter
@@ -50,9 +53,14 @@ public class Ticket {
     @Field(name = "is_junk")
     private Boolean junk = false;
 
+    @Field(name = "junked_by")
+    private String junkedBy;
+
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.S", timezone = "Asia/Kolkata")
     @Field(name = "created_date")
     private String createdDate;
 
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.S", timezone = "Asia/Kolkata")
     @Field(name = "updated_date")
     private String updatedDate;
 
@@ -68,6 +76,7 @@ public class Ticket {
     @Field(name = "is_escalated")
     private Boolean escalated;
 
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.S", timezone = "Asia/Kolkata")
     @Field(name = "escalated_date")
     private String escalatedDate;
 
@@ -96,4 +105,7 @@ public class Ticket {
     @Field(name ="is_escalated_to_admin")
     private Boolean escalatedToAdmin;
 
+    @Field(name = "reminder_counter")
+    private Long reminderCounter;
+
 }

src/main/java/org/upsmf/grievance/repository/UserRepository.java

 package org.upsmf.grievance.repository;
 
 import io.lettuce.core.dynamic.annotation.Param;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
@@ -17,4 +19,10 @@ public interface UserRepository extends PagingAndSortingRepository<User,Long> {
 
     @Query(value = "select u from users u where u.id = :id", nativeQuery = true)
     User findByUserId(@Param("id") Long id);
+
+    @Query("SELECT u FROM User u WHERE LOWER(u.email) LIKE LOWER(CONCAT('%', ?1,'%')) "
+            + "OR LOWER(u.firstName) LIKE LOWER(CONCAT('%', ?1,'%'))"
+            + "OR LOWER(u.lastname) LIKE LOWER(CONCAT('%', ?1,'%'))"
+            + "OR LOWER(u.phoneNumber) LIKE LOWER(CONCAT('%', ?1,'%'))")
+    Page<User> findByEmailWithPagination(String searchKeyword, Pageable pageable);
 }

src/main/java/org/upsmf/grievance/service/EmailService.java

@@ -24,4 +24,6 @@ public interface EmailService {
     void sendMailWithAttachment(EmailDetails details);
 
     void sendMailToDGME(EmailDetails details, JsonNode assessmentMatrix);
+
+    public void sendMailToNodalOfficers(EmailDetails details, Ticket ticket);
 }

src/main/java/org/upsmf/grievance/service/IntegrationService.java

@@ -6,6 +6,7 @@ import org.springframework.http.ResponseEntity;
 import org.upsmf.grievance.dto.CreateUserDto;
 import org.upsmf.grievance.dto.UpdateUserDto;
 import org.upsmf.grievance.dto.UserResponseDto;
+import org.upsmf.grievance.model.OtpRequest;
 import org.upsmf.grievance.model.User;
 
 public interface IntegrationService {
@@ -30,4 +31,6 @@ public interface IntegrationService {
     User deactivateUser(JsonNode payload) throws Exception;
 
     ResponseEntity<String> login(JsonNode body);
+
+    Boolean sendMobileOTP(String name, String phoneNumber, String otp);
 }