Responsive Pages

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

@@ -1,7 +1,6 @@
 package com.innovature.Library.controller;
 
 import java.io.IOException;
-//import java.security.Principal;
 import java.util.Collection;
 import java.util.List;
 
@@ -26,15 +25,12 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import com.innovature.Library.entity.Books;
-import com.innovature.Library.entity.Borrow;
-//import com.innovature.Library.entity.Category;
 import com.innovature.Library.form.BooksForm;
 import com.innovature.Library.repository.BooksRepository;
 import com.innovature.Library.service.BooksService;
 import com.innovature.Library.util.FileUtil;
 import com.innovature.Library.view.BooksDetailView;
-//import com.innovature.Library.view.BooksListView;
-//import com.innovature.Library.view.BooksListView;
+
 
 @RestController
 @RequestMapping("/books")
@@ -45,7 +41,7 @@ public class BooksController {
 
     @Autowired
     private BooksRepository booksRepository;
-    private Integer booksId;
+
 
 
     @PostMapping
@@ -114,15 +110,7 @@ public BooksDetailView update(
         Page<Books> list = service.getAllBooks(pageNo-1, pageSize, sortBy,direction);
         return new ResponseEntity<Page<Books>>(list,new HttpHeaders(),
         HttpStatus.OK);
-
-    }
-
-
-
-
-
-
-
+  }
 
 
     @PostMapping("/save/image/{booksId}")
@@ -136,8 +124,6 @@ public void saveBookImage(@RequestParam(value="image" )  MultipartFile multipart
 
         booksRepository.save(books);
 
-    //  String UploadDir = "userProfile-photos/" + savedUserProfile.getUserprofileId();
-
         FileUtil.saveUserProfile(fileName, multipartFile);
 
     }
@@ -150,7 +136,6 @@ public HttpEntity<byte[]> getImagePic(@PathVariable Integer booksId) {
 
 
     //pie
-
     @GetMapping("admin/pie")
     public List<Object[]> getcountByCategoryId() {
         return service.getBookCountByCategory();
@@ -165,8 +150,7 @@ public ResponseEntity<Page<Books>> getAllBookStockSearch(
             @RequestParam(defaultValue = "10") Integer pageSize,
             @RequestParam(defaultValue = "books_id") String sortBy,
             @RequestParam(defaultValue = "-1") Integer direction) {
-        System.out.println("paage size" + pageSize);
-        Page<Books> list = service.getAllBookStocks(keyword, pageNo - 1, pageSize, sortBy,direction);
+         Page<Books> list = service.getAllBookStocks(keyword, pageNo - 1, pageSize, sortBy,direction);
         return new ResponseEntity<Page<Books>>(list, new HttpHeaders(),
                 HttpStatus.OK);
 

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

@@ -5,15 +5,11 @@
 import java.sql.Date;
 import java.util.List;
 import java.io.IOException;
-
 import java.text.SimpleDateFormat;
-import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
-import javax.validation.Valid;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpHeaders;
@@ -76,19 +72,6 @@ public Collection<Borrow> list() {
     }
 
 
-//pagenated borrow list at admin borrow
-// @GetMapping("/pagenated/")
-// public ResponseEntity<List<Borrow>>getAllBorrows(
-//                     @RequestParam(defaultValue = "1") Integer pageNo,
-//                     @RequestParam(defaultValue = "5") Integer pageSize,
-//                     @RequestParam(defaultValue = "id") String sortBy)
-// {
-//     List<Borrow> list = bService.getAllBorrows(pageNo-1, pageSize, sortBy);
-//     return new ResponseEntity<List<Borrow>>(list,new HttpHeaders(),
-//     HttpStatus.OK);
-
-// }
-
 //BORROW @ADMIN //pagenated borrow list at admin VIEW borrow single api
 @GetMapping("/admin/pagenated/")
 public ResponseEntity<Page<Borrow>>getAllBorTest(
@@ -104,36 +87,6 @@ public Collection<Borrow> list() {
 }
 
 
-//LOAD-FILTER@ADMIN//load results of issuedate filter at Admin Borrow
-// @GetMapping("/loadByIssueDate/{date1}/{date2}")
-// public ResponseEntity<List<Borrow>> loadByIssueDate( 
-// @PathVariable("date1") Date date1,
-//  @PathVariable("date2") Date date2)
-
-// {   
-//     List<Borrow> list = bService.loadtAllByIssueDate(date1, date2);
-//     return new ResponseEntity<List<Borrow>>(list,new HttpHeaders(),
-//     HttpStatus.OK);
-// }
-
-
-//GET FILTER RESULT@ADMIN//filtered pagenated borrow list [on filtering] @admin//
-// @GetMapping("/{date1}/{date2}")
-// public ResponseEntity<List<Borrow>>getFilterBorrow(
-//                     // @PathVariable Date date1, @PathVariable Date date2,
-//                     @PathVariable("date1") Date date1,
-//                     @PathVariable("date2") Date date2,
-//                     @RequestParam(defaultValue = "1") Integer pageNo,
-//                     @RequestParam(defaultValue = "5") Integer pageSize,
-//                     @RequestParam(defaultValue = "id") String sortBy)
-// {
-
-//     List<Borrow> list = bService.getAllBorrow(date1, date2,pageNo-1, pageSize, sortBy);
-//     return new ResponseEntity<List<Borrow>>(list,new HttpHeaders(),
-//     HttpStatus.OK);
-
-// }
-
 //GET FILTER RESULT@ADMIN//filtered single api
 @GetMapping("/admin/{date1}/{date2}")
 public ResponseEntity<Page<Borrow>>getTestFilterBorrow(
@@ -152,7 +105,7 @@ public Collection<Borrow> list() {
 }
 
 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 
 
 
@@ -182,7 +135,6 @@ public ResponseEntity<List<Borrow>> loadByIssueDateUser(
 
     }
 
-////////////////////////////////////////////////////////////////////////////////////
 
 
 
@@ -283,7 +235,7 @@ public BorrowDetailView undo(
 
 
 
-/////////////////////////////////////
+    
 
 
 
@@ -319,29 +271,11 @@ public void Exportcsv(HttpServletResponse httpServletResponse) throws IOExceptio
         String[] nameMapping = { "borrowId","firstName","booksName",  "issueDate", "returnDate", "dueDate","bookReturnedDate","reason","dueDays","fine","status" };
         csvWriter.writeHeader(csvHeader);
         for (Borrow rent : rents) {
-            //  System.out.println("         :"+rent.getStatus());
-            csvWriter.write(rent, nameMapping);
+          csvWriter.write(rent, nameMapping);
         }
         csvWriter.flush();
         csvWriter.close();
     }
 
 
-    // @GetMapping("/admin/searchUser")
-    // public ResponseEntity<Page<Borrow>> getAllBorrowedUserSearch(
-    //         @RequestParam(defaultValue = "") String keyword,
-    //         @RequestParam(defaultValue = "1") Integer pageNo,
-    //         @RequestParam(defaultValue = "10") Integer pageSize)
-    //         // @RequestParam(defaultValue = "user_id") String sortBy)
-    //          {
-    //     System.out.println("paage size" + pageSize);
-    //     Page<Borrow> list = bService.getAllBorrowedUserSearch(keyword, pageNo - 1, pageSize);
-    //     return new ResponseEntity<Page<Borrow>>(list, new HttpHeaders(),
-    //             HttpStatus.OK);
-
-    // }
-
-
-
-
 }

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

@@ -2,11 +2,6 @@
 
 import java.util.Random;
 
-import javax.security.auth.Subject;
-import javax.validation.Valid;
-
-// import java.util.Random;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -16,30 +11,26 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.innovature.Library.form.BorrowForm;
+
 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.view.BorrowDetailView;
+
 
 
 import com.innovature.Library.entity.Email;
 import com.innovature.Library.entity.User;
-import com.innovature.Library.form.EmailForm;
-import com.innovature.Library.repository.EmailRepository;
 import com.innovature.Library.repository.UserRepository;
-import com.innovature.Library.service.EmailService;
+
 
 // tgsrhyrsrthr
 @RestController
 @RequestMapping("/email")
 public class EmailController {
 
-    // @Autowired
-    // private EmailService emailService;
-
+
     @Autowired
     private BorrowService service;
 
@@ -100,8 +91,7 @@ public String sendMail(@PathVariable("userId") Integer userId) {
 
     @PostMapping("verify")
     public boolean add(@RequestBody OtpForm form){
-        System.out.println("????????????????"+form.getEmail());
-        System.out.println("........."+form.getCnewPassword()+form.getNewPassword());
+
         return emailService.add(form);
     }
 

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

@@ -52,6 +52,8 @@ public class UsersController {
     @Autowired
     private UserService userService;
 
+
+
     @PostMapping
     public UserView add(@Valid @RequestBody UserForm form) {
         return userService.add(form);
@@ -85,6 +87,19 @@ public void deletes(
         userService.deletes(userId);
     }
 
+    // @GetMapping("/{userId}")
+    // public void deletes(
+    //         @PathVariable("userId") Integer userId) {
+    //     userService.deletes(userId);
+    // }
+
+
+    @GetMapping("/admin/{userId}")
+    public Collection getUserById(
+        @PathVariable("userId") Integer userId) {
+     return  userService.getUserById(userId);
+}
+
 
 
     @GetMapping("admin/pagenated/")

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

@@ -1,31 +1,25 @@
 package com.innovature.Library.controller;
 
 
-import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
+
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.CrossOrigin;
-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.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
 
-import com.innovature.Library.entity.csvUpload;
+
 import com.innovature.Library.csv_helper.csvHelper;
 import com.innovature.Library.csv_helper.ResponseMessage;
 import com.innovature.Library.service.csvService;
-// import librarymanagement.library.message.ResponseMeassage;
+
 
 @Controller
 @RequestMapping("/csv")

BackEnd/Library/src/main/java/com/innovature/Library/repository/UserRepository.java

@@ -13,6 +13,7 @@
 import org.springframework.data.jpa.repository.Query;
 
 import com.innovature.Library.entity.User;
+import com.innovature.Library.view.UserView;
 
 /**
  *
@@ -33,6 +34,8 @@ public interface UserRepository extends Repository<User, Integer> {
 
     Collection<User> findByUserId(Integer userId);
 
+    // UserView<User>findByUserId1(Integer userId);
+
     public Page<User> findAll(Pageable paging);
 
 

BackEnd/Library/src/main/java/com/innovature/Library/service/UserService.java

@@ -44,6 +44,8 @@ public interface UserService {
 
     void deletes(Integer userId);
 
+    Collection getUserById(Integer userId);
+
     Collection<User> listAll();
 
    // Collection<User> list();

BackEnd/Library/src/main/java/com/innovature/Library/service/impl/BorrowServiceImpl.java

@@ -358,10 +358,11 @@ public void sendMail(Integer userId, String subject, String text) {
         // TODO Auto-generated method stub
     }
 
+
     @Override
     @Transactional
     // @Scheduled(cron="* */1 * * * * ")
-    @Scheduled(cron = "0 0 12 * * ?")
+    @Scheduled(cron = "0 0 10 * * ?")
     public void fineGeneration() {
         System.out.println("reachllllllllllllll");
 
@@ -376,6 +377,7 @@ public void fineGeneration() {
             bor.setDueDays(due);
 
             bor.setFine(due * 5);
+            bor.setPaymentStatus("UNPAID");
         }
 
     }

BackEnd/Library/src/main/java/com/innovature/Library/service/impl/UserServiceImpl.java

@@ -236,5 +236,16 @@ public void deletes(Integer userId) throws NotFoundException {
 
 
 
+    @Override
+    public Collection getUserById(Integer userId) {
+
+        userRepository.findById(userId);
+        return userRepository.findByUserId(userId);              
+
+
+    }
+
+
+
 
 }