Enchance refractor clean up

src/main/java/com/ebiggerr/sims/controller/account/AccountMainController.java

@@ -68,8 +68,6 @@ public class AccountMainController {
 
     private final BCryptPasswordEncoder bCryptPasswordEncoder=new BCryptPasswordEncoder();
 
-    private boolean passwordMatch;
-
     //constructor dependency injection
     //@Autowired
     public AccountMainController(AuthenticationManager authenticationManager, Token_Provider tokenProvider, AccountService accountService, AccountAuthenticationService accountAuthenticationService) {
@@ -143,15 +141,15 @@ public API_Response registerAccount(@RequestBody AuthenticationRequest credentia
         String message="Something Went Wrong";
 
         if ( InputCheckValid.checkEmail( credentials.getUsername()) ) {
-            if ( accountService.registerAccount( credentials.getUsername(), encodedPasswordFromRegisterRequest ) ) return new API_Response().Success();
+            if ( accountService.registerAccount( credentials.getUsername(), encodedPasswordFromRegisterRequest ) ) return new API_Response().Success(); //successful registration
             else{
                 message = "Duplicates";
             }
         }
-        else{ return new API_Response().Failed("Invalid Email Address");
+        else{ return new API_Response().Failed("Invalid Email Address"); //If the email address does not pass the regex validation
         }
 
-        return new API_Response().Failed(message);
+        return new API_Response().Failed(message); //Meaningless message. ikr...
     }
 
     /**

src/main/java/com/ebiggerr/sims/controller/inventory/InventoryMainController.java

@@ -29,6 +29,7 @@
 import com.ebiggerr.sims.domain.response.API_Response;
 import com.ebiggerr.sims.domain.response.DemandResult;
 import com.ebiggerr.sims.domain.stock.Stock;
+import com.ebiggerr.sims.exception.CustomException;
 import com.ebiggerr.sims.service.DemandService;
 import com.ebiggerr.sims.service.input.InputCheckValid;
 import com.ebiggerr.sims.service.inventory.InventoryService;
@@ -84,7 +85,7 @@ public API_Response getAllFromInventory(@RequestParam(name ="pagenumber")int pag
      */
     @PreAuthorize("hasAnyAuthority('Admin','Manager','Staff')")
     @GetMapping(path="/inventory/all/categorical")
-    public API_Response getFromInventoryByCategory(@RequestParam(name ="pagenumber")int pageNumber, @RequestParam( name="pagesize")int pageSize, @RequestParam(name = "category", required = false) String categoryName, @RequestParam(name="categoryid") String categoryID){
+    public API_Response getFromInventoryByCategory(@RequestParam(name ="pagenumber")int pageNumber, @RequestParam( name="pagesize")int pageSize, @RequestParam(name = "category", required = false) String categoryName, @RequestParam(name="categoryid") String categoryID) throws CustomException {
 
         return new API_Response().Success(
                 inventoryService.getItemsByCategoryWithPageAndSize(pageNumber, pageSize, categoryName, categoryID)
@@ -177,14 +178,19 @@ public API_Response updateAnItem( @Valid @ModelAttribute(value = "itemWithImageR
 
     @PreAuthorize("hasAnyAuthority('Admin','Manager')")
     @PostMapping(path ="/inventory/itemWithImage")
-    public API_Response addNewItemWithImage( @Valid @ModelAttribute(value = "itemWithImageRequest") ItemWithImageRequest item) throws IOException {
+    public API_Response addNewItemWithImage( @Valid @ModelAttribute(value = "itemWithImageRequest") ItemWithImageRequest item) {
 
         message = InputCheckValid.checkAllForItem(item);
 
         Item response = null;
         if( message == null ){
-             response = inventoryService.addNewItemImage(item);
-             if( response == null ) return new API_Response().Failed("Duplicates in SKU");
+
+            try {
+                response = inventoryService.addNewItemImage(item);
+                if (response == null) return new API_Response().Failed("Duplicates in SKU");
+            }catch (Exception exception){
+                return new API_Response().Failed(exception.getMessage()); 
+            }
 
         }
 

src/main/java/com/ebiggerr/sims/mapper/AccountAuthenticationConverter.java

@@ -79,11 +79,12 @@ public AccountAuthenticationDTO entityToDTO(AccountAuthentication acc){
      */
     public List<AccountAuthenticationDTO> entitiesToDTO(List<AccountAuthentication> accList ){
 
-        List<AccountAuthenticationDTO> list=new LinkedList<>();
+        //@Deprecated
+        /*List<AccountAuthenticationDTO> list=new LinkedList<>();
 
         for( int index=0; index< accList.size(); index++){
             list.add( this.entityToDTO( accList.get(index) ) );
-        }
+        }*/
 
         return accList.stream().map(this::entityToDTO).collect(Collectors.toList());
 

src/main/java/com/ebiggerr/sims/repository/CategoryRepo.java

@@ -36,12 +36,6 @@ public interface CategoryRepo extends JpaRepository<Category,Long> {
     @Query(value="select listing.categoryid,category.categoryname, count(listing.categoryid) as value from itemlisting listing join itemcategory category ON listing.categoryid = category.categoryid group by listing.categoryid, category.categoryname order by listing.categoryid asc" ,nativeQuery=true)
     List<Category> getCategoricalAnalytics();
 
-    @Query(value="select category.categoryname, count(listing.categoryid) as value from itemlisting listing join itemcategory category ON listing.categoryid = category.categoryid group by listing.categoryid, category.categoryname order by listing.categoryid asc" ,nativeQuery=true)
-    List<Category> getCategoricalAnalyticsA();
-
-    @Query(value="SELECT categoryid FROM itemcategory WHERE categoryname=?1 ", nativeQuery=true)
-    int getCategoryIdByName(String categoryName);
-
     @Query(value="SELECT categoryid FROM itemcategory WHERE categoryname=?1 ", nativeQuery=true)
     Optional<Integer> getCategoryIdByNameOptional(String categoryName);
 

src/main/java/com/ebiggerr/sims/repository/RestockHistoryRepo.java

@@ -29,6 +29,7 @@
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Repository
@@ -39,4 +40,10 @@ public interface RestockHistoryRepo extends JpaRepository<RestockHistory,Long> {
     @Query(value=" INSERT INTO restockhistory (itemid,quantity,restocktime) VALUES (?1,?2,?3)", nativeQuery=true)
     void addNewHistory(Long itemid, int quantity, LocalDateTime restockTime);
 
+    @Modifying
+    @Transactional
+    @Query(value="INSERT INTO restockhistory (itemid,quantity,restocktime,accountid) VALUES( ?1,?2,?3, (SELECT accountauthentication.accountid FROM accountauthentication WHERE accountusername=?4 ) );", nativeQuery=true)
+    void addNewRestockHistoryWithAccountId(Long itemid, int quantity, LocalDateTime restockTimestamp, String accountUsername);
+    //TODO not yet do the unit testing for this query
+
 }

src/main/java/com/ebiggerr/sims/repository/TotalAssetsRepo.java

@@ -28,7 +28,11 @@
 
 public interface TotalAssetsRepo extends JpaRepository<TotalAssets,String> {
 
-
+    /**
+     * Planning update - adding more fields as the filters in the query
+     *
+     * @return the total amount of all active assets in the inventory
+     */
     @Query(value="SELECT SUM( stock.quantitycount * listing.itemunitprice ) AS totalassets FROM itemlisting listing join inventorystock stock on listing.itemid = stock.itemid",nativeQuery=true)
-    String gettotalassets();
+    String GetTheTotalAmountOfAllActiveAssetsInTheInventory();
 }

src/main/java/com/ebiggerr/sims/service/account/AccountService.java

@@ -79,8 +79,10 @@ public boolean registerAccount(String username,String password){
         // extract abc as the username of the account
         username = username.split("@")[0];
 
-        String latestId=accountRepo.getMaxId();
-        String newId= IdService.idIncrement(latestId);
+        String latestId=accountRepo.getMaxId(); //Not a good practice
+        String newId= IdService.idIncrement(latestId); //Not a good practice
+
+        //@Deprecated
         //accountRepo.insertANewRecordInTheAccountAuthenticationTableInTheDatabaseWithPendingAccountStatusAsDefault(newID,username,password,email);
 
         AccountEntity newAccount = new AccountEntity();

src/main/java/com/ebiggerr/sims/service/dashboard/DashboardService.java

@@ -46,7 +46,7 @@ public DashboardService(CategoryRepo categoryRepo, TotalAssetsRepo totalassetsRe
      */
     public Dashboard getAnalytics(){
 
-        return new Dashboard( categoryRepo.getCategoricalAnalytics(), totalassetsRepo.gettotalassets() );
+        return new Dashboard( categoryRepo.getCategoricalAnalytics(), totalassetsRepo.GetTheTotalAmountOfAllActiveAssetsInTheInventory() );
 
     }
 }

src/main/java/com/ebiggerr/sims/service/input/ImageUpload.java

@@ -48,18 +48,23 @@ public static String saveUploadFile(MultipartFile file, String filename) throws
 
         if( !file.isEmpty() ){
 
-            //String[] format = file.getOriginalFilename().split(".");
-            extension = Objects.requireNonNull(file.getOriginalFilename()).split("\\.")[1];
+            try {
+                //String[] format = file.getOriginalFilename().split(".");
+                extension = Objects.requireNonNull(file.getOriginalFilename()).split("\\.")[1];
 
-            filename = filename+ "."+ extension;
+                filename = filename + "." + extension;
 
-            //normal size
-            byte[] bytes = file.getBytes();
-            Path path = Paths.get(UPLOADED_FOLDER + filename);
-            Files.write(path, bytes);
+                //normal size
+                byte[] bytes = file.getBytes();
+                Path path = Paths.get(UPLOADED_FOLDER + filename);
+                Files.write(path, bytes);
 
-            //thumbnail size
-            //TODO thumbnail resize
+                //thumbnail size
+                //TODO thumbnail resize
+
+            }catch (Exception exception){
+                throw new IOException(exception.getMessage());
+            }
 
         }
 

src/main/java/com/ebiggerr/sims/service/inventory/InventoryService.java

@@ -22,11 +22,13 @@
 
 package com.ebiggerr.sims.service.inventory;
 
+import ch.qos.logback.classic.Logger;
 import com.ebiggerr.sims.domain.dashboard.Category;
 import com.ebiggerr.sims.domain.inventory.Item;
 import com.ebiggerr.sims.domain.inventory.ItemDTO;
 import com.ebiggerr.sims.domain.request.ItemWithImageRequest;
 import com.ebiggerr.sims.domain.response.Inventory;
+import com.ebiggerr.sims.exception.CustomException;
 import com.ebiggerr.sims.mapper.InventoryConverter;
 import com.ebiggerr.sims.repository.CategoryRepo;
 import com.ebiggerr.sims.repository.InventoryRepo;
@@ -64,7 +66,7 @@ public InventoryService(InventoryRepo inventoryRepo, CategoryRepo categoryRepo){
      * @return result of the operation , populated item if successful or null in the case of failure
      * @throws IOException IO exception if there is any error during the operation of writing image file from user request to the resource directory of the project
      */
-    public Item addNewItemImage(ItemWithImageRequest item) throws IOException {
+    public Item addNewItemImage(ItemWithImageRequest item) throws IOException, CustomException {
 
             int id = inventoryRepo.getMaxID();
 
@@ -73,17 +75,22 @@ public Item addNewItemImage(ItemWithImageRequest item) throws IOException {
             if( findDuplicates.isEmpty() ) {
 
                 Item repoItem = new Item();
-                //TODO use Optional
                 Optional<Integer> categoryIDOptional = categoryRepo.getCategoryIdByNameOptional( item.getCategoryName() );
                 long categoryID;
                 if( categoryIDOptional.isPresent() ) {
                     categoryID = categoryIDOptional.get();
                 }
                 else{
-                    return null;
+                    throw new CustomException("No Category found with the given ID.");
                 }
 
-                String imagePath = ImageUpload.saveUploadFile(item.getImage(), item.getSKU());
+                String imagePath = "";
+
+                try{
+                    imagePath = ImageUpload.saveUploadFile(item.getImage(), item.getSKU());
+                }catch (IOException exception){
+                    throw new IOException(exception.getMessage());
+                }
 
                 try {
                     Item itemEntity = new Item(
@@ -229,7 +236,7 @@ public Inventory getItemsSortedPageAndSize(int pageNumber, int pageSize){
      * @param categoryID id of the category
      * @return [inventory] result wrapped in together with the current page index and total pages available
      */
-    public Inventory getItemsByCategoryWithPageAndSize(int pageNumber, int pageSize, String categoryName, String categoryID){
+    public Inventory getItemsByCategoryWithPageAndSize(int pageNumber, int pageSize, String categoryName, String categoryID) throws CustomException {
 
         if( pageNumber == 0 || pageNumber < 0 ) pageNumber = DEFAULT_FIRST_PAGE;
         if( pageSize == 0 || pageSize <0 ) pageSize= DEFAULT_PAGE_SIZE;
@@ -239,8 +246,16 @@ public Inventory getItemsByCategoryWithPageAndSize(int pageNumber, int pageSize,
         categoryId = Integer.parseInt(categoryID);
 
         if( categoryId == 0 ){
-
-            categoryId = categoryRepo.getCategoryIdByName(categoryName);
+            Optional<Integer> categoryIdOptional = categoryRepo.getCategoryIdByNameOptional(categoryName);
+            if( categoryIdOptional.isPresent()){
+                categoryId = categoryIdOptional.get();
+            }
+            else{
+                throw new CustomException("No Category found with the given ID.");
+            }
+        }
+        else{
+            throw new CustomException("No Category found with the given ID.");
         }
 
         PageRequest pageRequest=PageRequest.of(pageNumber-1,pageSize, Sort.by("itemid").ascending() );