implement update and refactor error handling in insert

oskariorg · Oct 3, 2023 · 1079f6d · 1079f6d
1 parent eaaed62
commit 1079f6d
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 11 deletions.
diff --git a/...yplaces/src/main/java/fi/nls/oskari/control/myplaces/handler/MyPlacesFeaturesHandler.java b/...yplaces/src/main/java/fi/nls/oskari/control/myplaces/handler/MyPlacesFeaturesHandler.java
@@ -139,7 +139,7 @@ public void handlePut(ActionParameters params) throws ActionException {
 
         try {
             LOG.debug("Updating MyPlaces:", ids);
-            int updated = featureService.update(places);
+            int updated = mybatisFeatureService.update(places);
             LOG.info("Updated", updated, "/", places.size());
         } catch (ServiceException e) {
             LOG.warn(e);

diff --git a/service-myplaces/src/main/java/fi/nls/oskari/myplaces/MyPlaceMapper.java b/service-myplaces/src/main/java/fi/nls/oskari/myplaces/MyPlaceMapper.java
@@ -52,4 +52,16 @@ public interface MyPlaceMapper {
     @Options(useGeneratedKeys=true, keyColumn="id", keyProperty="id")
     Long addMyPlace(MyPlace myPlace);
 
+    @Update("UPDATE my_places SET " +
+            " category_id = #{categoryId}, " +
+            " name = #{name}, " +
+            " attention_text = #{attentionText}, " +
+            " updated = now(), " +
+            " geometry = ST_SetSRID(ST_GeometryFromText(#{geomAsText}), #{srid}), " +
+            " place_desc = #{desc}, " +
+            " link = #{link}, " +
+            " image_url = #{imageUrl} " +
+            " WHERE "+
+            " id = #{id} ")
+    Long updateMyPlace(MyPlace myPlace);
 }
diff --git a/...aces/src/main/java/fi/nls/oskari/myplaces/service/MyPlacesFeaturesServiceMybatisImpl.java b/...aces/src/main/java/fi/nls/oskari/myplaces/service/MyPlacesFeaturesServiceMybatisImpl.java
@@ -87,12 +87,37 @@ public long[] insert(List<MyPlace> places) throws ServiceException {
                 LOG.info("inserted myplace: ", place.getId());
             }
             session.commit();
+            return places.stream().mapToLong(MyPlace::getId).toArray();
         } catch (Exception e) {
             LOG.warn(e, "Exception when trying to add MyPlaces: ");
+            throw new ServiceException(e.getMessage());
         }
+    }
+
 
-        long[] ids = places.stream().mapToLong(place -> place.getId()).toArray();
-        return ids;
+    @Override
+    public int update(List<MyPlace> places) throws ServiceException {
+        try (SqlSession session = factory.openSession()) {
+            LOG.debug("Adding new places: ", places);
+            final MyPlaceMapper mapper = session.getMapper(MyPlaceMapper.class);
+            for (MyPlace place : places) {
+                Geometry transformed = this.doGeometryTransform(place.getGeometry());
+                place.setGeometry(transformed);
+
+                mapper.updateMyPlace(place);
+                LOG.info("inserted myplace: ", place.getId());
+            }
+            session.commit();
+            return places.size();
+        } catch (Exception e) {
+            LOG.warn(e, "Exception when trying to add MyPlaces ");
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    @Override
+    public int delete(long[] ids) throws ServiceException {
+        return 0;
     }
 
     private Geometry doGeometryTransform(Geometry geometry) throws ServiceException {
@@ -124,13 +149,5 @@ private int getSRID(String srsName) {
         return Integer.parseInt(srid);
     }
 
-    @Override
-    public int update(List<MyPlace> places) throws ServiceException {
-        return 0;
-    }
 
-    @Override
-    public int delete(long[] ids) throws ServiceException {
-        return 0;
-    }
 }