delete added to place list

src/main/java/scot/carricksoftware/grants/controllers/places/places/PLaceListControllerImpl.java

@@ -95,7 +95,7 @@ public class PLaceListControllerImpl implements PlaceListController {
     public final String placeDelete(@PathVariable final String id) {
         logger.debug("placeListControllerImpl::placeDelete");
         placeService.deleteById(Long.valueOf(id));
-        return MappingConstants.REDIRECT + MappingConstants.COUNTRIES;
+        return MappingConstants.REDIRECT + MappingConstants.PLACE_LIST;
     }
 
     @Override

src/main/java/scot/carricksoftware/grants/domains/census/Census.java

@@ -23,8 +23,9 @@ public class Census extends BaseEntity {
     @OneToMany(mappedBy = "census", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<CensusEntry> censusEntries = new ArrayList<>();
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
-    @JoinColumn(name = "census_place_id")
+    @JoinColumn(name = "place_id")
     private Place place;
 
     @Enumerated(EnumType.STRING)

src/main/java/scot/carricksoftware/grants/domains/census/CensusEntry.java

@@ -17,7 +17,7 @@ public class CensusEntry extends BaseEntity {
 
     @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
-    @JoinColumn(name = "censusEntry_census_id")
+    @JoinColumn(name = "census_id")
     private Census census;
 
     @SuppressWarnings("JpaDataSourceORMInspection")

src/main/java/scot/carricksoftware/grants/domains/places/Country.java

@@ -21,6 +21,7 @@ public class Country extends BaseEntity {
     @OneToMany(mappedBy = "country", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Region> regions = new ArrayList<>();
 
+
     public String getName() {
         return name;
     }

src/main/java/scot/carricksoftware/grants/domains/places/Place.java

@@ -18,8 +18,9 @@ public class Place extends BaseEntity {
 
     private String name;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
-    @JoinColumn(name = "place_region_id")
+    @JoinColumn(name = "region_id")
     private Region region;
 
     @SuppressWarnings("unused")

src/main/java/scot/carricksoftware/grants/domains/places/Region.java

@@ -17,14 +17,14 @@ public class Region extends BaseEntity {
 
     private String name;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
-    @JoinColumn(name = "region_country_id")
+    @JoinColumn(name = "country_id")
     private Country country;
 
     @OneToMany(mappedBy = "region", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Place> places = new ArrayList<>();
 
-
     @SuppressWarnings("unused")
     public String getName() {
         return name;

src/main/resources/templates/place/list.html

@@ -40,6 +40,9 @@
                 <td th:text="${place.region != null} ? ${place.region.name}"></td>
                 <td th:text="${place.region.country != null} ? ${place.region.country.name}"></td>
                 <td><span>
+                     <a th:action="delete" class="btn btn-danger btn-sm" href=""
+                        th:href="'place/' + ${place.id} + '/delete'"
+                        th:text="Delete"></a>
                     <a th:action="edit" class="btn btn-warning btn-sm"
                        th:href="'place/' + ${place.id} + '/edit'"
                        th:text="Edit"></a>