Arun

BackEnd/Library/src/main/java/com/innovature/Library/configuration/WebSecurityConfiguration.java

@@ -53,6 +53,10 @@ protected void configure(HttpSecurity http) throws Exception {
                 .securityContext().and()
                 .anonymous().and()
                 .authorizeRequests()
+
+                .antMatchers(GET,"/users/admin/**/").access("hasRole('ROLE_ADMIN')")
+                .antMatchers(GET,"/users/admin/viewProfile").access("hasRole('ROLE_ADMIN')")
+
                 .antMatchers(OPTIONS, "/users").anonymous()
                 .antMatchers(POST, "/users").anonymous()
                 .antMatchers(OPTIONS, "/login").anonymous()
@@ -62,7 +66,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .antMatchers(OPTIONS, "/**").anonymous() 
 
                 //category
-                 .antMatchers(GET,"/category/admin").access("hasRole('ROLE_ADMIN')")
+                 .antMatchers(GET,"/category/admin/**/").access("hasRole('ROLE_ADMIN')")
                  .antMatchers(POST,"/category").access("hasRole('ROLE_ADMIN')")
                  .antMatchers(DELETE,"/category").access("hasRole('ROLE_ADMIN')")
                  .antMatchers(PUT,"/category/{catogoryId}").access("hasRole('ROLE_ADMIN')")
@@ -71,6 +75,7 @@ protected void configure(HttpSecurity http) throws Exception {
                  .antMatchers(GET,"/books/admin/**/").access("hasRole('ROLE_ADMIN')")
                  .antMatchers(GET,"/books/user/**/").access("hasRole('ROLE_USER')")
                  .antMatchers(POST,"/books").access("hasRole('ROLE_ADMIN')")
+                 .antMatchers(POST,"/books/save/image/{booksId}").access("hasRole('ROLE_ADMIN')")
                  .antMatchers(DELETE,"/books/{booksId}").access("hasRole('ROLE_ADMIN')")
                  .antMatchers(PUT,"/books/{booksId}").access("hasRole('ROLE_ADMIN')")
 
@@ -80,6 +85,8 @@ protected void configure(HttpSecurity http) throws Exception {
                  .antMatchers(POST,"/borrow/").access("hasRole('ROLE_USER')")
                  .antMatchers(PUT,"/borrow/admin/**").access("hasRole('ROLE_ADMIN')")
 
+                 //user
+
 
 
 

BackEnd/Library/src/main/java/com/innovature/Library/controller/BorrowController.java

@@ -69,8 +69,27 @@ public Collection<Borrow> list() {
         return new ResponseEntity<Page<Borrow>>(list,new HttpHeaders(),
         HttpStatus.OK);
 
+
+
+    }
+
+    @GetMapping("/admin/statusFilter/")
+    public ResponseEntity<Page<Borrow>>getAllBorrowByStatus(
+                        @RequestParam(defaultValue = "1") Integer pageNo,
+                        @RequestParam(defaultValue = "5") Integer pageSize,
+                        @RequestParam(defaultValue = "borrowId") String sortBy,
+                        @RequestParam(defaultValue = "1") Integer direction,
+                        @RequestParam(defaultValue = "1") Integer status)
+    {
+        Page<Borrow> list = bService.getAllBorrByStat(pageNo-1, pageSize, sortBy,direction,status);
+        return new ResponseEntity<Page<Borrow>>(list,new HttpHeaders(),
+        HttpStatus.OK);
+
+
+
     }
 
+
 
 //BORROW @ADMIN //pagenated borrow list at admin VIEW borrow single api
 @GetMapping("/admin/pagenated/")
@@ -166,6 +185,20 @@ public Collection<Borrow> listDue() {
     }
 
 
+    @GetMapping("/admin/fine/")
+public ResponseEntity<Page<Borrow>>listfine(
+                    @RequestParam(defaultValue = "1") Integer pageNo,
+                    @RequestParam(defaultValue = "5") Integer pageSize,
+                    @RequestParam(defaultValue = "borrowId") String sortBy,
+                    @RequestParam(defaultValue = "1") Integer direction)
+{
+    Page<Borrow> list = bService.getAllFine(pageNo-1, pageSize, sortBy,direction);
+    return new ResponseEntity<Page<Borrow>>(list,new HttpHeaders(),
+    HttpStatus.OK);
+
+}
+
+
     @GetMapping("admin/fine")
     public Collection<Borrow> listfine() {
         return bService.fine();
@@ -238,7 +271,7 @@ public BorrowDetailView undo(
 
 
 
-
+//chart
 @GetMapping("/admin/chart")
     public rentChartView getchart(){
         rentChartView test =borrowServices.getChart();

BackEnd/Library/src/main/java/com/innovature/Library/controller/EmailController.java

@@ -1,7 +1,10 @@
 package com.innovature.Library.controller;
 
+
 import java.util.Random;
 
+import java.time.LocalTime;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -11,21 +14,17 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-
 import com.innovature.Library.form.EmailForm;
 import com.innovature.Library.form.OtpForm;
 import com.innovature.Library.repository.EmailRepository;
 import com.innovature.Library.service.BorrowService;
 import com.innovature.Library.service.EmailService;
 
-
-
 import com.innovature.Library.entity.Email;
 import com.innovature.Library.entity.User;
 import com.innovature.Library.repository.UserRepository;
 
 
-// tgsrhyrsrthr
 @RestController
 @RequestMapping("/email")
 public class EmailController {
@@ -58,41 +57,137 @@ public String sendMail(@PathVariable("userId") Integer userId) {
 
 
     @PostMapping("/emailsentotp")
-    public ResponseEntity<?>sendOtpEmail(@RequestBody EmailForm form){
+    public ResponseEntity sendOtpEmail(@RequestBody EmailForm form){
+    String emailid=form.getSentto();
 
+   if("".equals(emailid) ){
 
+    return ResponseEntity.status(HttpStatus.NOT_ACCEPTABLE).body("NULL VALUE EXCEPTION-");
+   }
+   else{
         User user=userRepository.findByEmailId(form.getSentto());
              if(user!=null){
-                emailRepository.deleteAll();
+
                 Random random = new Random();
                 int otp = 100000 + random.nextInt(900000);
                 Email otp2= new Email();
                 otp2.setOtp(otp);
-                otp2.setEmail(form.getSentto());
+                otp2.setEmail(form.getSentto());      
+
+                LocalTime myObj = LocalTime.now();
+                LocalTime exp=myObj;
+                otp2.setExpiry(exp);
 
-                emailRepository.save(otp2);
+               var email=form.getSentto();                      
+               Email email2= emailRepository.findByEmail(email);
+
+               if(email2!=null){
+               email2.setOtp(otp); 
+               email2.setExpiry(exp);   
+               emailRepository.save(email2);
+               }
+               else
+               emailRepository.save(otp2);
+
                 boolean result = this.emailService.sendEmail("OTP Verification","Your OTP to change your password is \t"+ otp +"\tuse it to create a new password.", form.getSentto());
                 // "OTP Verification", "Your OTP to change your password is "+"otp"+"use it to create a new password."
                 if(result){
-                    return  ResponseEntity.ok("Email Sent!");
-                }else{
-                    return  ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Email not sent.");
+                    return  new ResponseEntity(null,HttpStatus.ACCEPTED);
+                }
+                else{
+                    return new ResponseEntity(null,HttpStatus.EXPECTATION_FAILED);
                 }
             }
             else{
-                return null;
+                return new ResponseEntity(null,HttpStatus.BAD_REQUEST);
+
             }
 
+        }
+
 
     }
 
 
+    @PostMapping("verify")
+    public ResponseEntity add(@RequestBody OtpForm form){
+       var otp=form.getOtp();
+        if(otp==null){
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("NULL VALUE EXCEPTION");
+        }
+        else{
 
+            ResponseEntity result = emailService.add(form);
+
+    if(result.getStatusCodeValue()==202){
+    return new ResponseEntity(HttpStatus.ACCEPTED);
+
+    }
+    else if(result.getStatusCodeValue()==504){
+    return ResponseEntity.status(HttpStatus.GATEWAY_TIMEOUT).body("OTP EXPIRED");
+    }
+
+    else
+      return ResponseEntity.status(HttpStatus.NOT_ACCEPTABLE).body("OTP VERIFICATION FAILED");
+    }
+    }
 
-    @PostMapping("verify")
-    public boolean add(@RequestBody OtpForm form){
 
-        return emailService.add(form);
+    // @PostMapping("verify")
+    // public ResponseEntity add(@RequestBody OtpForm form){
+    //    var otp=form.getOtp();
+    //     if(otp==null){
+    //         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("NULL VALUE EXCEPTION");
+    //     }
+    //     else{
+
+    //     boolean result = emailService.add(form);
+    //     if(result)
+    //     {
+    //         return new ResponseEntity(null,HttpStatus.ACCEPTED);
+    //         // return new ResponseEntity.status(HttpStatus.ACCEPTED).body("OTP VERIFICATION SUCCESS");
+    //     }
+    //     else
+    //     {
+    //         // return new ResponseEntity(null,HttpStatus.BAD_REQUEST);
+
+    //         return ResponseEntity.status(HttpStatus.NOT_ACCEPTABLE).body("OTP VERIFICATION FAILED");
+    //     }
+    // }
+    // }
+
+
+
+    @PostMapping("verifyPassword")
+    public ResponseEntity addPassword(@RequestBody OtpForm form){
+
+    var psd=form.getNewPassword();
+    var npsd=form.getCnewPassword();
+
+    if(psd==null || npsd==null){
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("NULL VALUE EXCEPTION");
+        }
+    else if(!psd.equals(npsd) ){
+        return ResponseEntity.status(HttpStatus.BAD_GATEWAY).body("PASSWORD MISSMATCH");
+    }
+    else{
+
+        boolean result = emailService.addPassword(form);
+    if(result)
+    {
+        return new ResponseEntity(null,HttpStatus.ACCEPTED);
+    }
+    else
+    {
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("PASSWORD CHANGE FAILED");
+    }
+}
+
+
+
+
+
+
     }
 
 

BackEnd/Library/src/main/java/com/innovature/Library/controller/UsersController.java

@@ -1,8 +1,4 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
+
 package com.innovature.Library.controller;
 
 import java.security.Principal;
@@ -13,29 +9,22 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.http.HttpEntity;
 import org.springframework.http.ResponseEntity;
-import org.springframework.util.StringUtils;
+
 
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-// import java.util.Collection;
 import javax.validation.Valid;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-// import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+
 
 import com.innovature.Library.entity.User;
-// import com.innovature.Library.entity.User;
 import com.innovature.Library.form.UserForm;
 import com.innovature.Library.security.util.SecurityUtil;
 import com.innovature.Library.service.UserService;
@@ -73,6 +62,10 @@ public Collection<User> list(Principal p) {
     public Collection<User> viewProfile(){
         return userService.viewProfile(SecurityUtil.getCurrentUserId());
     }
+    @GetMapping("/admin/viewProfile/")
+    public Collection<User> viewAdminProfile(){
+        return userService.viewProfile(SecurityUtil.getCurrentUserId());
+    }
 
     @PutMapping("/{userId}")
     public UserView updates(
@@ -87,11 +80,6 @@ public void deletes(
         userService.deletes(userId);
     }
 
-    // @GetMapping("/{userId}")
-    // public void deletes(
-    //         @PathVariable("userId") Integer userId) {
-    //     userService.deletes(userId);
-    // }
 
 
     @GetMapping("/admin/{userId}")
@@ -102,7 +90,7 @@ public Collection getUserById(
 
 
 
-    @GetMapping("admin/pagenated/")
+    @GetMapping("/admin/pagenated/")
     public ResponseEntity<Page<User>>getAllBooks(
                         @RequestParam(defaultValue = "1") Integer pageNo,
                         @RequestParam(defaultValue = "10") Integer pageSize,