JUnit Test cases for Inventory API with Java Code Coverage 23% V1

pom.xml

@@ -12,18 +12,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.2</version>
-
+		<version>3.2.1</version>
 		<relativePath />
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
 		<java.version>17</java.version>
-		<org.springframework.boot.version>3.2.2</org.springframework.boot.version>
-
+		<org.springframework.boot.version>3.2.1</org.springframework.boot.version>
 		<org.springframework.hateoas.version>0.10.0.RELEASE</org.springframework.hateoas.version>
 		<m2e.apt.activation>jdt_apt</m2e.apt.activation>
 		<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
@@ -162,12 +159,20 @@
 			<artifactId>jackson-datatype-joda</artifactId>
 			<version>2.4.0</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
 		</dependency>
 
+		<!--
+		https://mvnrepository.com/artifact/org.springframework.security.oauth/spring-security-oauth2 -->
+		<dependency>
+			<groupId>org.springframework.security.oauth</groupId>
+			<artifactId>spring-security-oauth2</artifactId>
+			<version>2.5.2.RELEASE</version>
+		</dependency>
+
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-cache</artifactId>
@@ -191,7 +196,10 @@
 			<artifactId>lombok</artifactId>
 			<version>${lombok.version}</version>
 		</dependency>
-
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-jpa</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis</artifactId>
@@ -213,12 +221,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
-				<exclusions>
-					<exclusion>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-logging</artifactId>
-					</exclusion>
-				</exclusions>
 			<!-- <version>2.5.5</version> Use the latest stable version -->
 		</dependency>
 		<dependency>
@@ -235,7 +237,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
-
+		<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+			<version>2.0</version>
+		</dependency>
 		<!-- https://mvnrepository.com/artifact/junit/junit -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -246,8 +253,8 @@
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
 		</dependency>
-
 	</dependencies>
+
 	<build>
 		<finalName>Inventoryapi-v1.0</finalName>
 		<plugins>

src/main/java/com/iemr/inventory/RoleMasterApplication.java

@@ -25,7 +25,6 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -40,7 +39,7 @@
 @ComponentScan
 @SpringBootApplication
 @EnableCaching(proxyTargetClass = true)
-public class RoleMasterApplication extends SpringBootServletInitializer{
+public class RoleMasterApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(roleMasterApplication, args);

src/main/java/com/iemr/inventory/config/InterceptorConfig.java

@@ -0,0 +1,66 @@
+/*
+ * AMRIT – Accessible Medical Records via Integrated Technology
+ * Integrated EHR (Electronic Health Records) Solution
+ *
+ * Copyright (C) "Piramal Swasthya Management and Research Institute"
+ *
+ * This file is part of AMRIT.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+package com.iemr.inventory.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Repository;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import com.iemr.inventory.utils.http.HTTPRequestInterceptor;
+
+//@Repository
+@Component
+@Configuration
+@EnableAutoConfiguration
+public class InterceptorConfig implements WebMvcConfigurer {
+
+    @Autowired(required = false)
+    private HTTPRequestInterceptor requestInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new BlockingMethodInterceptor()).addPathPatterns("/**");
+
+        // Add your HTTPRequestInterceptor if available
+        if (requestInterceptor != null) {
+            registry.addInterceptor(requestInterceptor).addPathPatterns("/**");
+        }
+    }
+}
+
+/* 
+
+@Configuration
+public class InterceptorConfig implements WebMvcConfigurer {
+    @Autowired(required=false)
+    HTTPRequestInterceptor requestInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new BlockingMethodInterceptor())
+                .addPathPatterns("/**");
+    }
+} */

src/main/java/com/iemr/inventory/controller/Supplier/SupplierMasterController.java

@@ -31,7 +31,6 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.iemr.inventory.data.supplier.M_Supplier;
@@ -40,7 +39,9 @@
 import com.iemr.inventory.utils.mapper.InputMapper;
 import com.iemr.inventory.utils.response.OutputResponse;
 
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+
+
 
 @RestController
 public class SupplierMasterController {
@@ -51,8 +52,8 @@ public class SupplierMasterController {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@CrossOrigin()
-	@ApiOperation(value = "Create supplier", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/createSupplier", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+	@Operation(summary = "Create supplier")
+	@RequestMapping(value = "/createSupplier", headers = "Authorization", produces = {
 			"application/json" })
 	public String createSupplier(@RequestBody String createSupplier) {
 
@@ -101,8 +102,8 @@ public String createSupplier(@RequestBody String createSupplier) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Get supplier", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/getSupplier", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+	@Operation(summary = "Get supplier")
+	@RequestMapping(value = "/getSupplier", headers = "Authorization", produces = {
 			"application/json" })
 	public String getSupplier(@RequestBody String getSupplier) {
 
@@ -126,8 +127,8 @@ public String getSupplier(@RequestBody String getSupplier) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Edit supplier", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/editSupplier", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+	@Operation(summary = "Edit supplier")
+	@RequestMapping(value = "/editSupplier", headers = "Authorization", produces = {
 			"application/json" })
 	public String editSupplier(@RequestBody String editSupplier) {
 
@@ -164,8 +165,8 @@ public String editSupplier(@RequestBody String editSupplier) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Delete supplier", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/deleteSupplier", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+	@Operation(summary = "Delete supplier")
+	@RequestMapping(value = "/deleteSupplier", headers = "Authorization", produces = {
 			"application/json" })
 	public String deleteSupplier(@RequestBody String deleteSupplier) {
 

src/main/java/com/iemr/inventory/controller/dispenseagainst_rx/DispenseAgainstRX.java

@@ -34,7 +34,9 @@
 import com.iemr.inventory.service.dispenseagainst_rx.DispenseAgainstRXimpl;
 import com.iemr.inventory.utils.response.OutputResponse;
 
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+
+
 
 @Service
 @RestController
@@ -46,7 +48,7 @@ public class DispenseAgainstRX {
 	private DispenseAgainstRXimpl dispenseAgainstRXimpl;
 
 	@CrossOrigin()
-	@ApiOperation(value = "Get prescribed medicines", consumes = "application/json", produces = "application/json")
+	@Operation(summary = "Get prescribed medicines")
 	@RequestMapping(value = "getPrescribedMedicines", method = RequestMethod.POST)
 	public String getPrescribedMedicinesToDispense(@RequestBody String requestOBJ) {
 		OutputResponse response = new OutputResponse();

src/main/java/com/iemr/inventory/controller/drugtype/DrugtypeController.java

@@ -31,15 +31,16 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.iemr.inventory.data.drugtype.M_Drugtype;
 import com.iemr.inventory.service.drugtype.DrugtypeInter;
 import com.iemr.inventory.utils.mapper.InputMapper;
 import com.iemr.inventory.utils.response.OutputResponse;
 
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+
+
 
 @RestController
 public class DrugtypeController {
@@ -49,8 +50,8 @@ public class DrugtypeController {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@CrossOrigin()
-	@ApiOperation(value = "Create drug type", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/createDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+	@Operation(summary = "Create drug type")
+	@RequestMapping(value = "/createDrugtype", headers = "Authorization", produces = {
 			"application/json" })
 	public String createManufacturer(@RequestBody String createDrugtype) {
 
@@ -74,8 +75,8 @@ public String createManufacturer(@RequestBody String createDrugtype) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Get drug type", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/getDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+	@Operation(summary = "Get drug type")
+	@RequestMapping(value = "/getDrugtype", headers = "Authorization", produces = {
 			"application/json" })
 	public String getManufacturer(@RequestBody String getDrugtype) {
 
@@ -99,8 +100,8 @@ public String getManufacturer(@RequestBody String getDrugtype) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Edit drug type", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/editDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+	@Operation(summary = "Edit drug type")
+	@RequestMapping(value = "/editDrugtype", headers = "Authorization", produces = {
 			"application/json" })
 	public String editManufacturer(@RequestBody String editDrugtype) {
 
@@ -132,8 +133,8 @@ public String editManufacturer(@RequestBody String editDrugtype) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Delete drug type", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/deleteDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+	@Operation(summary = "Delete drug type")
+	@RequestMapping(value = "/deleteDrugtype", headers = "Authorization", produces = {
 			"application/json" })
 	public String deleteManufacturer(@RequestBody String deleteDrugtype) {
 

src/main/java/com/iemr/inventory/controller/facilitytype/FacilitytypeController.java

@@ -31,15 +31,16 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.iemr.inventory.data.facilitytype.M_facilitytype;
 import com.iemr.inventory.service.facilitytype.M_facilitytypeInter;
 import com.iemr.inventory.utils.mapper.InputMapper;
 import com.iemr.inventory.utils.response.OutputResponse;
 
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+
+
 
 @RestController
 public class FacilitytypeController {
@@ -50,8 +51,8 @@ public class FacilitytypeController {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@CrossOrigin()
-	@ApiOperation(value = "Get facility", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/getFacility", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+	@Operation(summary = "Get facility")
+	@RequestMapping(value = "/getFacility", headers = "Authorization", produces = {
 			"application/json" })
 	public String getFacility(@RequestBody String getFacility) {
 
@@ -75,8 +76,8 @@ public String getFacility(@RequestBody String getFacility) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Add facility", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/addFacility", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+	@Operation(summary = "Add facility")
+	@RequestMapping(value = "/addFacility", headers = "Authorization", produces = {
 			"application/json" })
 	public String addFacility(@RequestBody String addFacility) {
 
@@ -100,8 +101,8 @@ public String addFacility(@RequestBody String addFacility) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Edit facility", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/editFacility", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+	@Operation(summary = "Edit facility")
+	@RequestMapping(value = "/editFacility", headers = "Authorization", produces = {
 			"application/json" })
 	public String editFacility(@RequestBody String editFacility) {
 
@@ -132,8 +133,8 @@ public String editFacility(@RequestBody String editFacility) {
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Delete facility", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/deleteFacility", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+	@Operation(summary = "Delete facility")
+	@RequestMapping(value = "/deleteFacility", headers = "Authorization", produces = {
 			"application/json" })
 	public String deleteFacility(@RequestBody String deleteFacility) {