Merge pull request #255 from USACE/chore/add-project-attributes

Add project attributes
USACE · Feb 20, 2025 · 68ac45e · 68ac45e
2 parents 001e779 + f415282
commit 68ac45e
Show file tree

Hide file tree

Showing 11 changed files with 244 additions and 99 deletions.
diff --git a/api/internal/db/batch.go b/api/internal/db/batch.go
diff --git a/api/internal/db/models.go b/api/internal/db/models.go
diff --git a/api/internal/db/project.sql_gen.go b/api/internal/db/project.sql_gen.go
diff --git a/api/internal/dto/project.go b/api/internal/dto/project.go
@@ -5,9 +5,14 @@ import (
 )
 
 type ProjectDTO struct {
-	ID         uuid.UUID  `json:"-"`
-	Name       string     `json:"name"`
-	FederalID  *string    `json:"federal_id" required:"false"`
-	DistrictID *uuid.UUID `json:"district_id" required:"false"`
+	ID             uuid.UUID `json:"-"`
+	Name           string    `json:"name"`
+	FederalID      *string   `json:"federal_id" required:"false"`
+	DistrictID     uuid.UUID `json:"district_id" required:"false"`
+	LeveeSegmentID *string   `json:"levee_segment_id" required:"false"`
+	BridgeID       *string   `json:"bridge_id" required:"false"`
+	Watershed      *string   `json:"watershed" required:"false"`
+	TzName         *string   `json:"tz_name" required:"false"`
+	Metadata       *string   `json:"metadata" required:"false"`
 	AuditInfo
 }
diff --git a/api/internal/handler/project_test.go b/api/internal/handler/project_test.go
@@ -19,7 +19,8 @@ const districtSchema = `{
         "initials": { "type": "string" },
         "division_name": { "type": "string" },
         "division_initials": { "type": "string" },
-        "office_id": { "type": ["string", "null"] }
+        "office_id": { "type": ["string", "null"] },
+        "instrument_count": { "type": "number" }
     },
     "additionalProperties": false
 }`
@@ -40,6 +41,11 @@ const projectSchema = `{
         "district_id": { "type": [ "string", "null"] },
         "slug": { "type": "string" },
         "name": { "type": "string" },
+        "bridge_id": { "type": ["string", "null"] },
+        "levee_segment_id": { "type": ["string", "null"] },
+        "watershed": { "type": ["string", "null"] },
+        "tz_name": { "type": ["string", "null"] },
+        "metadata": { "type": ["string", "null"] },
         "created_by": { "type": "string" },
         "created_by_username": { "type": "string" },
         "created_at": { "type": "string", "format": "date-time" },
@@ -84,7 +90,12 @@ const createProjectBulkBody = `[{
 },
 {
     "name": "Test Project 100001",
-    "federal_id": null
+    "federal_id": null,
+    "levee_segment_id": "ABC123",
+    "bridge_id": "DEF456",
+    "watershed": "Test Watershed",
+    "tz_name": "UTC",
+    "metadata": "test metadata"
 },
 {
     "name": "Test Project 100002",
@@ -93,7 +104,12 @@ const createProjectBulkBody = `[{
 
 const updateProjectBody = `{
     "federal_id": null,
-    "name": "Blue Water Reservoir"
+    "name": "Blue Water Reservoir",
+    "levee_segment_id": "UPDATED_ID",
+    "bridge_id": "UPDATED_ID",
+    "watershed": "Test Update Watershed",
+    "tz_name": "EST",
+    "metadata": "test update metadata"
 }`
 
 func TestProjects(t *testing.T) {