Skip to content

Commit 49afaff

Browse files
5Amogh5Amogh
authored
Merge pull request #95 from PSMRI/release-3.2.0
Release 3.2.0 - AMM-1718
2 parents e599ffa + 580092a commit 49afaff

31 files changed

Lines changed: 318 additions & 210 deletions

‎Dockerfile‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# --- Stage 1: Build the application using Maven ---
2+
FROM maven:3.9.6-eclipse-temurin-17 AS build
3+
4+
WORKDIR /app
5+
6+
COPY . .
7+
8+
# Build the application while caching Maven dependencies to speed up future builds
9+
RUN --mount=type=cache,target=/root/.m2 \
10+
mvn clean package -DENV_VAR=docker -DskipTests -Dgit.skip=true
11+
12+
# --- Stage 2: Run the application with a minimal JRE image ---
13+
FROM eclipse-temurin:17-jre
14+
15+
WORKDIR /app
16+
17+
# Copy the built WAR file from the build stage
18+
COPY --from=build /app/target/*.war app.war
19+
20+
EXPOSE 8080
21+
22+
ENTRYPOINT ["java", "-jar", "app.war"]

‎pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,18 @@
461461
</execution>
462462
</executions>
463463
</plugin>
464+
<plugin>
465+
<groupId>org.springframework.boot</groupId>
466+
<artifactId>spring-boot-maven-plugin</artifactId>
467+
<version>3.2.2</version>
468+
<executions>
469+
<execution>
470+
<goals>
471+
<goal>repackage</goal>
472+
</goals>
473+
</execution>
474+
</executions>
475+
</plugin>
464476
</plugins>
465477
</build>
466478
<reporting>

‎src/main/environment/.gitkeep‎

Whitespace-only changes.

‎src/main/environment/common_ci.properties‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ spring.datasource.url=@env.DATABASE_URL@
22
spring.datasource.username=@env.DATABASE_USERNAME@
33
spring.datasource.password=@env.DATABASE_PASSWORD@
44
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
5-
common-api-url=@env.COMMON_API@
5+
6+
common-api-url-searchuserbyid=@env.COMMON_API@beneficiary/searchUserByID
7+
common-api-url-searchBeneficiary=@env.COMMON_API@beneficiary/searchBeneficiary
8+
69
callcentre-server-ip=@env.CALLCENTRE_SERVER_IP@
710
### Redis IP
8-
spring.data.redis.host=localhost
11+
spring.data.redis.host=@env.REDIS_HOST@
912
jwt.secret=@env.JWT_SECRET_KEY@
1013

1114

@@ -16,3 +19,5 @@ logging.file.name=@env.INVENTORY_API_LOGGING_FILE_NAME@
1619
springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
1720
springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
1821

22+
cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@
23+

‎src/main/environment/common_docker.properties‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
spring.datasource.url=${DATABASE_URL}
2+
spring.datasource.username=${DATABASE_USERNAME}
3+
spring.datasource.password=${DATABASE_PASSWORD}
4+
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
5+
6+
common-api-url-searchuserbyid=${COMMON_API}beneficiary/searchUserByID
7+
common-api-url-searchBeneficiary=${COMMON_API}beneficiary/searchBeneficiary
8+
9+
callcentre-server-ip=${CALLCENTRE_SERVER_IP}
10+
### Redis IP
11+
spring.data.redis.host=${REDIS_HOST}
12+
jwt.secret=${JWT_SECRET_KEY}
13+
14+
15+
#ELK logging file name
16+
logging.path=logs/
17+
logging.file.name=${INVENTORY_API_LOGGING_FILE_NAME}
18+
19+
springdoc.api-docs.enabled=${SWAGGER_DOC_ENABLED}
20+
springdoc.swagger-ui.enabled=${SWAGGER_DOC_ENABLED}

‎src/main/environment/common_example.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,14 @@ spring.profiles.active=test
88
callcentre-server-ip=10.208.122.99
99
common-api-url=http://localhost:8083/
1010

11+
12+
common-api-url-searchuserbyid=http://localhost:8083/beneficiary/searchUserByID
13+
common-api-url-searchBeneficiary=http://localhost:8083/beneficiary/searchBeneficiary
14+
1115
### Redis IP
1216
spring.data.redis.host=localhost
1317
jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
1418
logging.path=logs/
1519
logging.file.name=logs/inventory-api.log
20+
21+
cors.allowed-origins=http://localhost:*

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030
import org.springframework.beans.factory.annotation.Autowired;
31-
import org.springframework.web.bind.annotation.CrossOrigin;
31+
3232
import org.springframework.web.bind.annotation.RequestBody;
3333
import org.springframework.web.bind.annotation.RequestMapping;
3434
import org.springframework.web.bind.annotation.RequestMethod;
@@ -50,7 +50,6 @@ public class SupplierMasterController {
5050

5151
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
5252

53-
@CrossOrigin()
5453
@ApiOperation(value = "Create supplier", consumes = "application/json", produces = "application/json")
5554
@RequestMapping(value = "/createSupplier", headers = "Authorization", method = { RequestMethod.POST }, produces = {
5655
"application/json" })
@@ -100,7 +99,6 @@ public String createSupplier(@RequestBody String createSupplier) {
10099

101100
}
102101

103-
@CrossOrigin()
104102
@ApiOperation(value = "Get supplier", consumes = "application/json", produces = "application/json")
105103
@RequestMapping(value = "/getSupplier", headers = "Authorization", method = { RequestMethod.POST }, produces = {
106104
"application/json" })
@@ -125,7 +123,6 @@ public String getSupplier(@RequestBody String getSupplier) {
125123

126124
}
127125

128-
@CrossOrigin()
129126
@ApiOperation(value = "Edit supplier", consumes = "application/json", produces = "application/json")
130127
@RequestMapping(value = "/editSupplier", headers = "Authorization", method = { RequestMethod.POST }, produces = {
131128
"application/json" })
@@ -163,7 +160,6 @@ public String editSupplier(@RequestBody String editSupplier) {
163160
return response.toString();
164161
}
165162

166-
@CrossOrigin()
167163
@ApiOperation(value = "Delete supplier", consumes = "application/json", produces = "application/json")
168164
@RequestMapping(value = "/deleteSupplier", headers = "Authorization", method = { RequestMethod.POST }, produces = {
169165
"application/json" })

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.slf4j.LoggerFactory;
2626
import org.springframework.beans.factory.annotation.Autowired;
2727
import org.springframework.stereotype.Service;
28-
import org.springframework.web.bind.annotation.CrossOrigin;
28+
2929
import org.springframework.web.bind.annotation.RequestBody;
3030
import org.springframework.web.bind.annotation.RequestMapping;
3131
import org.springframework.web.bind.annotation.RequestMethod;
@@ -45,7 +45,6 @@ public class DispenseAgainstRX {
4545
@Autowired
4646
private DispenseAgainstRXimpl dispenseAgainstRXimpl;
4747

48-
@CrossOrigin()
4948
@ApiOperation(value = "Get prescribed medicines", consumes = "application/json", produces = "application/json")
5049
@RequestMapping(value = "getPrescribedMedicines", method = RequestMethod.POST)
5150
public String getPrescribedMedicinesToDispense(@RequestBody String requestOBJ) {

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030
import org.springframework.beans.factory.annotation.Autowired;
31-
import org.springframework.web.bind.annotation.CrossOrigin;
31+
3232
import org.springframework.web.bind.annotation.RequestBody;
3333
import org.springframework.web.bind.annotation.RequestMapping;
3434
import org.springframework.web.bind.annotation.RequestMethod;
@@ -48,7 +48,6 @@ public class DrugtypeController {
4848

4949
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
5050

51-
@CrossOrigin()
5251
@ApiOperation(value = "Create drug type", consumes = "application/json", produces = "application/json")
5352
@RequestMapping(value = "/createDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
5453
"application/json" })
@@ -73,7 +72,6 @@ public String createManufacturer(@RequestBody String createDrugtype) {
7372

7473
}
7574

76-
@CrossOrigin()
7775
@ApiOperation(value = "Get drug type", consumes = "application/json", produces = "application/json")
7876
@RequestMapping(value = "/getDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
7977
"application/json" })
@@ -98,7 +96,6 @@ public String getManufacturer(@RequestBody String getDrugtype) {
9896

9997
}
10098

101-
@CrossOrigin()
10299
@ApiOperation(value = "Edit drug type", consumes = "application/json", produces = "application/json")
103100
@RequestMapping(value = "/editDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
104101
"application/json" })
@@ -131,7 +128,6 @@ public String editManufacturer(@RequestBody String editDrugtype) {
131128

132129
}
133130

134-
@CrossOrigin()
135131
@ApiOperation(value = "Delete drug type", consumes = "application/json", produces = "application/json")
136132
@RequestMapping(value = "/deleteDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
137133
"application/json" })

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030
import org.springframework.beans.factory.annotation.Autowired;
31-
import org.springframework.web.bind.annotation.CrossOrigin;
31+
3232
import org.springframework.web.bind.annotation.RequestBody;
3333
import org.springframework.web.bind.annotation.RequestMapping;
3434
import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,7 +49,6 @@ public class FacilitytypeController {
4949

5050
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
5151

52-
@CrossOrigin()
5352
@ApiOperation(value = "Get facility", consumes = "application/json", produces = "application/json")
5453
@RequestMapping(value = "/getFacility", headers = "Authorization", method = { RequestMethod.POST }, produces = {
5554
"application/json" })
@@ -74,7 +73,6 @@ public String getFacility(@RequestBody String getFacility) {
7473
return response.toString();
7574
}
7675

77-
@CrossOrigin()
7876
@ApiOperation(value = "Add facility", consumes = "application/json", produces = "application/json")
7977
@RequestMapping(value = "/addFacility", headers = "Authorization", method = { RequestMethod.POST }, produces = {
8078
"application/json" })
@@ -99,7 +97,6 @@ public String addFacility(@RequestBody String addFacility) {
9997
return response.toString();
10098
}
10199

102-
@CrossOrigin()
103100
@ApiOperation(value = "Edit facility", consumes = "application/json", produces = "application/json")
104101
@RequestMapping(value = "/editFacility", headers = "Authorization", method = { RequestMethod.POST }, produces = {
105102
"application/json" })
@@ -131,7 +128,6 @@ public String editFacility(@RequestBody String editFacility) {
131128
return response.toString();
132129
}
133130

134-
@CrossOrigin()
135131
@ApiOperation(value = "Delete facility", consumes = "application/json", produces = "application/json")
136132
@RequestMapping(value = "/deleteFacility", headers = "Authorization", method = { RequestMethod.POST }, produces = {
137133
"application/json" })

0 commit comments

Comments
 (0)