feat: implement geometry and relation management services with associated DTOs, repository logic, and database queries
Build and Release / release (push) Successful in 1m20s

This commit is contained in:
2026-06-06 19:19:18 +07:00
parent fd8d413760
commit 463f7a3ac0
6 changed files with 61 additions and 1 deletions
+1
View File
@@ -254,3 +254,4 @@ SELECT entity_id, geometry_id
FROM entity_geometries
WHERE entity_id = ANY($1::uuid[]);
@@ -142,3 +142,4 @@ func (h *GeometryController) GetGeometriesByBoundWith(c fiber.Ctx) error {
Data: res,
})
}
+1 -1
View File
@@ -21,7 +21,7 @@ type GetGeometriesByEntityIDsDto struct {
}
type GetRelationsDto struct {
Type string `json:"type" query:"type" validate:"required,oneof=wiki-entity entity-wiki geometry-entity entity-geometry"`
Type string `json:"type" query:"type" validate:"required,oneof=wiki-entity entity-wiki geometry-entity entity-geometry entity-geometry-bound-with"`
IDs []string `json:"ids" query:"ids" validate:"required,min=1,dive,uuid"`
}
@@ -626,3 +626,4 @@ func (r *geometryRepository) GetGeometryIDsByEntityIDs(ctx context.Context, enti
return result, nil
}
+1
View File
@@ -182,3 +182,4 @@ func (s *geometryService) SearchGeometriesByEntityName(
NextCursor: nextCursor,
}, nil
}
+56
View File
@@ -42,6 +42,10 @@ func (s *relationService) GetRelations(ctx context.Context, req *request.GetRela
return s.getEntitiesByGeometryIDs(ctx, req.IDs)
case "entity-geometry":
return s.getGeometriesByEntityIDs(ctx, req.IDs)
case "entity-geometry-child":
return s.getGeometriesByEntityIDsFiltered(ctx, req.IDs, true)
case "entity-geometry-alone":
return s.getGeometriesByEntityIDsFiltered(ctx, req.IDs, false)
default:
return nil, fiber.NewError(fiber.StatusBadRequest, "Unsupported relation type")
}
@@ -238,3 +242,55 @@ func (s *relationService) getGeometriesByEntityIDs(ctx context.Context, entityID
return result, nil
}
func (s *relationService) getGeometriesByEntityIDsFiltered(ctx context.Context, entityIDs []string, keepBoundWith bool) (map[string][]*response.GeometryResponse, *fiber.Error) {
mapping, err := s.geometryRepo.GetGeometryIDsByEntityIDs(ctx, entityIDs)
if err != nil {
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch geometry IDs by entity IDs")
}
totalGeometryIDs := 0
for _, gIDs := range mapping {
totalGeometryIDs += len(gIDs)
}
geometryIDMap := make(map[string]struct{}, totalGeometryIDs)
allGeometryIDs := make([]string, 0, totalGeometryIDs)
for _, gIDs := range mapping {
for _, gID := range gIDs {
if _, ok := geometryIDMap[gID]; !ok {
geometryIDMap[gID] = struct{}{}
allGeometryIDs = append(allGeometryIDs, gID)
}
}
}
geometries, err := s.geometryRepo.GetByIDs(ctx, allGeometryIDs)
if err != nil {
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch geometries")
}
geometriesByID := make(map[string]*models.GeometryEntity, len(geometries))
for _, g := range geometries {
geometriesByID[g.ID] = g
}
result := make(map[string][]*response.GeometryResponse, len(entityIDs))
for _, idStr := range entityIDs {
gIDs, exists := mapping[idStr]
result[idStr] = make([]*response.GeometryResponse, 0, len(gIDs))
if exists {
for _, gID := range gIDs {
if g, found := geometriesByID[gID]; found {
hasBoundWith := g.BoundWith != nil && *g.BoundWith != ""
if (keepBoundWith && hasBoundWith) || (!keepBoundWith && !hasBoundWith) {
result[idStr] = append(result[idStr], g.ToResponse())
}
}
}
}
}
return result, nil
}