fix: remove treecluster coords and region if no trees are provided

green-ecolution · Oct 17, 2024 · ac7a9a7 · ac7a9a7
1 parent 1fe6e8c
commit ac7a9a7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/internal/service/domain/treecluster/geo_locator.go b/internal/service/domain/treecluster/geo_locator.go
@@ -35,7 +35,24 @@ func (s *GeoClusterLocator) UpdateCluster(ctx context.Context, clusterID *int32)
 		return err
 	}
 
-	treeIDs := utils.Map(cluster.Trees, func(t *entities.Tree) int32 {
+	if len(cluster.Trees) == 0 {
+		return s.removeClusterCoords(ctx, *clusterID)
+	}
+
+	return s.setClusterCoords(ctx, *clusterID, cluster.Trees)
+}
+
+func (s *GeoClusterLocator) removeClusterCoords(ctx context.Context, clusterID int32) error {
+	_, err := s.clusterRepo.Update(ctx, clusterID,
+		treecluster.WithLatitude(nil),
+		treecluster.WithLongitude(nil),
+		treecluster.WithRegion(nil),
+	)
+	return err
+}
+
+func (s *GeoClusterLocator) setClusterCoords(ctx context.Context, clusterID int32, trees []*entities.Tree) error {
+	treeIDs := utils.Map(trees, func(t *entities.Tree) int32 {
 		return t.ID
 	})
 
@@ -49,7 +66,7 @@ func (s *GeoClusterLocator) UpdateCluster(ctx context.Context, clusterID *int32)
 		return err
 	}
 
-	_, err = s.clusterRepo.Update(ctx, *clusterID,
+	_, err = s.clusterRepo.Update(ctx, clusterID,
 		treecluster.WithLatitude(&lat),
 		treecluster.WithLongitude(&long),
 		treecluster.WithRegion(region),

diff --git a/internal/storage/postgres/region/get.go b/internal/storage/postgres/region/get.go
@@ -12,10 +12,8 @@ import (
 func (r *RegionRepository) GetAll(ctx context.Context) ([]*entities.Region, error) {
 	rows, err := r.store.GetAllRegions(ctx)
 	if err != nil {
-		fmt.Printf("error: %v\n", err)
 		return nil, err
 	}
-	fmt.Printf("rows: %v\n", rows)
 
 	return r.mapper.FromSqlList(rows), nil
 }

diff --git a/internal/storage/postgres/treecluster/update.go b/internal/storage/postgres/treecluster/update.go
@@ -44,15 +44,15 @@ func (r *TreeClusterRepository) updateEntity(ctx context.Context, tc *entities.T
 		Name:           tc.Name,
 	}
 
+	if err := r.store.UnlinkTreeClusterID(ctx, &tc.ID); err != nil {
+		return err
+	}
+
 	if len(tc.Trees) > 0 {
 		treeIDs := utils.Map(tc.Trees, func(t *entities.Tree) int32 {
 			return t.ID
 		})
 
-		if err := r.store.UnlinkTreeClusterID(ctx, &tc.ID); err != nil {
-			return err
-		}
-
 		if err := r.LinkTreesToCluster(ctx, tc.ID, treeIDs); err != nil {
 			return err
 		}