diff --git a/.gitignore b/.gitignore index a1ecf03..ad3ba30 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ target/ #configs config.service.ts config.json -*.properties #other .springBeans @@ -13,6 +12,7 @@ hs_err_pid7608.log .classpath /.sts4-cache /logs +.idea # Properties -src/main/environment/104_test.properties \ No newline at end of file +src/main/environment/104_local.properties diff --git a/.java-version b/.java-version new file mode 100644 index 0000000..6259340 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +1.8 diff --git a/pom.xml b/pom.xml index 9491f22..0a2bddc 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 104api-v1.0 ${ENV_VAR} target/classes/application.properties - src/main/environment/104_${environment}.properties + target/classes/104_${environment}.properties @@ -250,31 +250,69 @@ - - + org.apache.maven.plugins + maven-resources-plugin + + + filter-resources + process-resources + + resources + + + @ + false + + + src/main/environment + true + + 104_${environment}.properties + + + + + + + + org.apache.maven.plugins maven-antrun-plugin - 1.8 - process-resources run - properties-updated + merge-properties - concatinating properties file ${target-properties} and - ${source-properties} + + concatenating properties file ${target-properties} and + ${source-properties} + + force="yes"> + + process-resources + + run + + clean-property-files + + + + + + + + @@ -309,7 +347,7 @@ 104api-v1.0 target/classes/application.properties - src/main/environment/104_${environment}.properties + target/classes/104_${environment}.properties 104api-v1.0 diff --git a/src/main/environment/104_ci.properties b/src/main/environment/104_ci.properties new file mode 100644 index 0000000..1994aab --- /dev/null +++ b/src/main/environment/104_ci.properties @@ -0,0 +1,19 @@ +# local env +# DB Connections +## Primary db +spring.datasource.url=@env.DATABASE_URL@ +spring.datasource.username=@env.DATABASE_USERNAME@ +spring.datasource.password=@env.DATABASE_PASSWORD@ +spring.datasource.driver-class-name=com.mysql.jdbc.Driver + +secondary.datasource.username=@env.REPORTING_DATABASE_USERNAME@ +secondary.datasource.password=@env.REPORTING_DATABASE_PASSWORD@ +secondary.datasource.url=@env.REPORTING_DATABASE_URL@ +secondary.datasource.driver-class-name=com.mysql.jdbc.Driver + +# Common Config +common-url=@env.COMMON_API_BASE_URL@ + +### Redis IP +spring.redis.host=localhost + diff --git a/src/main/environment/104_local.properties b/src/main/environment/104_example.properties similarity index 100% rename from src/main/environment/104_local.properties rename to src/main/environment/104_example.properties diff --git a/src/main/environment/104_uat.propertie b/src/main/environment/104_uat.properties similarity index 100% rename from src/main/environment/104_uat.propertie rename to src/main/environment/104_uat.properties diff --git a/src/main/java/com/iemr/helpline104/config/BlockingHttpMethodInterceptor.java b/src/main/java/com/iemr/helpline104/config/BlockingHttpMethodInterceptor.java new file mode 100644 index 0000000..42e5b8a --- /dev/null +++ b/src/main/java/com/iemr/helpline104/config/BlockingHttpMethodInterceptor.java @@ -0,0 +1,35 @@ +package com.iemr.helpline104.config; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +public class BlockingHttpMethodInterceptor implements HandlerInterceptor { + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + String method = request.getMethod(); + if (!("GET".equals(method) || "POST".equals(method))) { + response.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED); + return false; + } + return true; +} + + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, + ModelAndView modelAndView) throws Exception { + // TODO Auto-generated method stub + } + + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) + throws Exception { + // TODO Auto-generated method stub + } +} + diff --git a/src/main/java/com/iemr/helpline104/config/InterceptorConfig.java b/src/main/java/com/iemr/helpline104/config/InterceptorConfig.java index 4c982f4..5662c0f 100644 --- a/src/main/java/com/iemr/helpline104/config/InterceptorConfig.java +++ b/src/main/java/com/iemr/helpline104/config/InterceptorConfig.java @@ -35,9 +35,17 @@ public class InterceptorConfig extends WebMvcConfigurerAdapter @Autowired HTTPRequestInterceptor requestInterceptor; +// @Override +// public void addInterceptors(InterceptorRegistry registry) +// { +// registry.addInterceptor(requestInterceptor); +// } + @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(requestInterceptor); + registry.addInterceptor(new BlockingHttpMethodInterceptor()) + .addPathPatterns("/**"); + } } \ No newline at end of file diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104appetiteRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104appetiteRepo.java index 4adc2f5..2e01eb6 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104appetiteRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104appetiteRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104appetite; @Repository +@RestResource(exported = false) public interface M_104appetiteRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104bladderRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104bladderRepo.java index 1d9108e..0175c5c 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104bladderRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104bladderRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104bladder; @Repository +@RestResource(exported = false) public interface M_104bladderRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104bowelRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104bowelRepo.java index f94fc8d..867a80b 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104bowelRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104bowelRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104bowel; @Repository +@RestResource(exported = false) public interface M_104bowelRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104courseRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104courseRepo.java index 45e71ec..2e849e3 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104courseRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104courseRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104course; @Repository +@RestResource(exported = false) public interface M_104courseRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104familyconditionRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104familyconditionRepo.java index c585623..fd4bb1a 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104familyconditionRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104familyconditionRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104familycondition; @Repository +@RestResource(exported = false) public interface M_104familyconditionRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104gettingwithfamilyRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104gettingwithfamilyRepo.java index 511d41f..924eb01 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104gettingwithfamilyRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104gettingwithfamilyRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104gettingwithfamily; @Repository +@RestResource(exported = false) public interface M_104gettingwithfamilyRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104householdworkRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104householdworkRepo.java index 28f7ba6..7b78dbd 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104householdworkRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104householdworkRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104householdwork; @Repository +@RestResource(exported = false) public interface M_104householdworkRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104hygieneselfcareRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104hygieneselfcareRepo.java index b6e979b..7f72d79 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104hygieneselfcareRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104hygieneselfcareRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104hygieneselfcare; @Repository +@RestResource(exported = false) public interface M_104hygieneselfcareRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104issuesatworkplaceRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104issuesatworkplaceRepo.java index 1623ed2..bc3b344 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104issuesatworkplaceRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104issuesatworkplaceRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104issuesatworkplace; @Repository +@RestResource(exported = false) public interface M_104issuesatworkplaceRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104libidoRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104libidoRepo.java index 0ead06e..4286017 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104libidoRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104libidoRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104libido; @Repository +@RestResource(exported = false) public interface M_104libidoRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104pastmedicalconditionRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104pastmedicalconditionRepo.java index b1c0778..aaf26bd 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104pastmedicalconditionRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104pastmedicalconditionRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104pastmedicalcondition; @Repository +@RestResource(exported = false) public interface M_104pastmedicalconditionRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104pastpsychiatricconditionRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104pastpsychiatricconditionRepo.java index 3bfd91a..272391f 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104pastpsychiatricconditionRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104pastpsychiatricconditionRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104pastpsychiatriccondition; @Repository +@RestResource(exported = false) public interface M_104pastpsychiatricconditionRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104precipitatingfactorRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104precipitatingfactorRepo.java index 92beeb0..c96f6e9 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104precipitatingfactorRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104precipitatingfactorRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104precipitatingfactor; @Repository +@RestResource(exported = false) public interface M_104precipitatingfactorRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104progressRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104progressRepo.java index 62841fe..a664a8d 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104progressRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104progressRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104progress; @Repository +@RestResource(exported = false) public interface M_104progressRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104regularworokRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104regularworokRepo.java index 68a0568..32f3062 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104regularworokRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104regularworokRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104regularworok; @Repository +@RestResource(exported = false) public interface M_104regularworokRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104relationshipRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104relationshipRepo.java index 1879ab0..15d26e6 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104relationshipRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104relationshipRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104relationship; @Repository +@RestResource(exported = false) public interface M_104relationshipRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104sleepRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104sleepRepo.java index cedd45a..56d13c5 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104sleepRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104sleepRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104sleep; @Repository +@RestResource(exported = false) public interface M_104sleepRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/M_104treatmenttypeRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/M_104treatmenttypeRepo.java index 4719ae3..7e56bce 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/M_104treatmenttypeRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/M_104treatmenttypeRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.M_104treatmenttype; @Repository +@RestResource(exported = false) public interface M_104treatmenttypeRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/PsychiatricChiefComplaintsRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/PsychiatricChiefComplaintsRepo.java index 67119da..508cb8a 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/PsychiatricChiefComplaintsRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/PsychiatricChiefComplaintsRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.PsychiatricChiefComplaints; @Repository +@RestResource(exported = false) public interface PsychiatricChiefComplaintsRepo extends CrudRepository { List findByDeleted(Boolean deleted); } diff --git a/src/main/java/com/iemr/helpline104/repository/hihl/T_hihlcocasesheetRepo.java b/src/main/java/com/iemr/helpline104/repository/hihl/T_hihlcocasesheetRepo.java index e1481e5..81b1776 100644 --- a/src/main/java/com/iemr/helpline104/repository/hihl/T_hihlcocasesheetRepo.java +++ b/src/main/java/com/iemr/helpline104/repository/hihl/T_hihlcocasesheetRepo.java @@ -26,11 +26,13 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.helpline104.data.hihl.T_hihlcocasesheet; @Repository +@RestResource(exported = false) public interface T_hihlcocasesheetRepo extends CrudRepository { @Query(value = "SELECT * from T_hihlcocasesheet WHERE BeneficiaryRegID = :benRegId ORDER BY ID DESC LIMIT 5", nativeQuery = true)