⏰ Refactor and setting up health controllers, geometries commented out

Author: PondiB

pom.xml

@@ -97,6 +97,13 @@
             <artifactId>slf4j-api</artifactId>
             <version>1.7.30</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.graphhopper.external/jackson-datatype-jts -->
+        <dependency>
+            <groupId>com.graphhopper.external</groupId>
+            <artifactId>jackson-datatype-jts</artifactId>
+            <version>0.10-2.5-2</version>
+        </dependency>
+
 
 
     </dependencies>

src/main/java/com/brianpondi/gis/controller/NairobiHealthFacilityController.java

@@ -0,0 +1,36 @@
+package com.brianpondi.gis.controller;
+
+import com.brianpondi.gis.entity.NairobiHealthFacility;
+import com.brianpondi.gis.service.NairobiHealthFacilityService;
+import javassist.NotFoundException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/nairobihealthfacilities")
+public class NairobiHealthFacilityController {
+
+        @Autowired
+        private NairobiHealthFacilityService nairobiHealthFacilityService;
+
+        @GetMapping
+        public List<NairobiHealthFacility> findAll() {
+            return nairobiHealthFacilityService.findAll();
+        }
+
+        @GetMapping(path = "/{id}")
+        public NairobiHealthFacility findById(@PathVariable("id") int id) {
+            try {
+                return nairobiHealthFacilityService.findById(id);
+            } catch (NotFoundException e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+
+    }

src/main/java/com/brianpondi/gis/controller/NairobiSubCountyController.java

@@ -10,11 +10,11 @@
 
 
 @RestController
-@RequestMapping("/api/nairobisubcounty")
+@RequestMapping("/api/nairobisubcounties")
 public class NairobiSubCountyController {
 
     @Autowired
-    NairobiSubCountyService nairobiSubCountyService;
+    private NairobiSubCountyService nairobiSubCountyService;
 
     @GetMapping
     public List<NairobiSubCounty> findAll() {

src/main/java/com/brianpondi/gis/entity/NairobiHealthFacility.java

@@ -1,6 +1,5 @@
 package com.brianpondi.gis.entity;
 
-import com.vividsolutions.jts.geom.Geometry;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,7 +17,7 @@ public class NairobiHealthFacility implements Serializable {
     @Id
     @GeneratedValue
     private Integer id;
-    private Geometry geom;
+//    private Point geom;
     private String name;
     private String contact;
 

src/main/java/com/brianpondi/gis/entity/NairobiSubCounty.java

@@ -1,9 +1,7 @@
 package com.brianpondi.gis.entity;
 
-import com.vividsolutions.jts.geom.Geometry;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.data.annotation.Transient;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -20,8 +18,8 @@ public class NairobiSubCounty implements Serializable {
     @Id
     @GeneratedValue
     private Integer id;
-    @Transient
-    private Geometry geom;
+//    private MultiPolygon geom;
     private String name;
 
+
 }

src/main/java/com/brianpondi/gis/service/NairobiHealthFacilityServiceImp.java renamed to src/main/java/com/brianpondi/gis/service/Impl/NairobiHealthFacilityServiceImp.java

@@ -1,23 +1,28 @@
-package com.brianpondi.gis.service;
+package com.brianpondi.gis.service.Impl;
 
 import com.brianpondi.gis.entity.NairobiHealthFacility;
 import com.brianpondi.gis.repository.NairobiHealthFacilityRepository;
+import com.brianpondi.gis.service.NairobiHealthFacilityService;
 import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.GeometryFactory;
 import com.vividsolutions.jts.io.ParseException;
 import com.vividsolutions.jts.io.WKTReader;
 import javassist.NotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+@Service
 public class NairobiHealthFacilityServiceImp implements NairobiHealthFacilityService {
 
+    @Autowired
+    private NairobiHealthFacilityRepository nairobiHealthFacilityRepository;
+
     private static GeometryFactory geometryFactory = new GeometryFactory();
     private static WKTReader wktReader = new WKTReader(geometryFactory);
 
-    @Autowired
-    NairobiHealthFacilityRepository nairobiHealthFacilityRepository;
+
 
     private static Geometry fromWkt(String wkt) {
         try {

src/main/java/com/brianpondi/gis/service/NairobiSubCountyServiceImp.java renamed to src/main/java/com/brianpondi/gis/service/Impl/NairobiSubCountyServiceImp.java

@@ -1,7 +1,8 @@
-package com.brianpondi.gis.service;
+package com.brianpondi.gis.service.Impl;
 
 import com.brianpondi.gis.entity.NairobiSubCounty;
 import com.brianpondi.gis.repository.NairobiSubCountyRepository;
+import com.brianpondi.gis.service.NairobiSubCountyService;
 import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.GeometryFactory;
 import com.vividsolutions.jts.io.ParseException;
@@ -19,11 +20,13 @@
 @Service
 public class NairobiSubCountyServiceImp implements NairobiSubCountyService {
 
+    @Autowired
+    NairobiSubCountyRepository nairobiSubCountyRepository;
+
     private static GeometryFactory geometryFactory = new GeometryFactory();
     private static WKTReader wktReader = new WKTReader(geometryFactory);
 
-    @Autowired
-    NairobiSubCountyRepository nairobiSubCountyRepository;
+
 
     private static Geometry fromWkt(String wkt) {
         try {

src/main/java/com/brianpondi/gis/service/NairobiHealthFacilityService.java

@@ -2,11 +2,10 @@
 
 import com.brianpondi.gis.entity.NairobiHealthFacility;
 import javassist.NotFoundException;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-@Service
+
 public interface NairobiHealthFacilityService {
     List<NairobiHealthFacility> findAll();
     NairobiHealthFacility findById(int id) throws NotFoundException;

src/main/java/com/brianpondi/gis/service/NairobiSubCountyService.java

@@ -2,11 +2,10 @@
 
 import com.brianpondi.gis.entity.NairobiSubCounty;
 import javassist.NotFoundException;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-@Service
+
 public interface NairobiSubCountyService {
     List<NairobiSubCounty> findAll();
     NairobiSubCounty findById(int id) throws NotFoundException;

src/main/resources/application.properties

@@ -3,6 +3,6 @@
 spring.datasource.url=jdbc:postgresql://localhost:5432/nairobigis
 spring.datasource.username=postgres
 spring.datasource.password=123456
-spring.jpa.properties.hibernate.dialect=org.hibernate.spatial.dialect.postgis.PostgisDialect
+spring.jpa.database-platform=org.hibernate.spatial.dialect.postgis.PostgisDialect
 spring.jpa.hibernate.ddl-auto=update
 server.port= 8081