Merge branch 'master' of https://github.com/rinatmini/DemeterEye

Author: flemsoft-dev

api/handlers_fields.go

@@ -115,6 +115,28 @@ func enrichFieldWithLatestReport(ctx context.Context, a *App, f *models.Field) {
 				WindSpeedMps:   toFloatPtr(it["wind_speed_mps"]),
 				ClarityPct:     toFloatPtr(it["clarity_pct"]),
 			}
+
+			// Populate point type for the UI safely: 0 = actual, 1 = forecast
+			if tv, ok := it["type"]; ok && tv != nil {
+				switch t := tv.(type) {
+				case int:
+					entry.Type = t
+				case int32:
+					entry.Type = int(t)
+				case int64:
+					entry.Type = int(t)
+				case float64:
+					entry.Type = int(math.Round(t))
+				default:
+					entry.Type = 0
+				}
+			} else if isFc, ok := it["isForecast"].(bool); ok && isFc {
+				entry.Type = 1
+			} else if isFc2, ok := it["isForcast"].(bool); ok && isFc2 {
+				entry.Type = 1
+			} else {
+				entry.Type = 0
+			}
 			h = append(h, entry)
 		}
 		if len(h) > 0 {
@@ -124,7 +146,7 @@ func enrichFieldWithLatestReport(ctx context.Context, a *App, f *models.Field) {
 
 	if doc.Forecast != nil && len(doc.Forecast) > 0 {
 		ff := &models.ReportForecast{
-			Model: "eurustic",
+			YieldModel: "eurustic",
 		}
 		// year
 		if y, ok := doc.Forecast["year"].(int32); ok {
@@ -144,9 +166,9 @@ func enrichFieldWithLatestReport(ctx context.Context, a *App, f *models.Field) {
 		ff.NDVIPeak = toFloatPtr(doc.Forecast["ndviPeak"])
 		ff.NDVIPeakAt = parseRFC3339Ptr(doc.Forecast["ndviPeakAt"])
 		if m, ok := doc.Forecast["model"].(string); ok && m != "" {
-			ff.Model = m
+			ff.YieldModel = m
 		}
-		ff.Confidence = toFloatPtr(doc.Forecast["confidence"])
+		ff.YieldConfidence = toFloatPtr(doc.Forecast["confidence"])
 
 		f.Forecast = ff
 	}

api/models/report.go

@@ -29,6 +29,7 @@ type Report struct {
 // ReportDaily — one daily observation as written by the processor.
 type ReportDaily struct {
 	Date           time.Time `bson:"date"                   json:"date"` // RFC3339 stored as time in Go
+	Type           int       `bson:"type,omitempty" json:"type"`         // 0: actual, 1: forecast
 	NDVI           *float64  `bson:"ndvi,omitempty"         json:"ndvi,omitempty"`
 	CloudCover     *int      `bson:"cloud_cover,omitempty"  json:"cloud_cover,omitempty"` // HLS cloud mask (0..100?)
 	Collection     string    `bson:"collection,omitempty"   json:"collection,omitempty"`  // e.g., "HLSS30_2.0"
@@ -41,10 +42,14 @@ type ReportDaily struct {
 
 // ReportForecast — forecast section produced by the processor.
 type ReportForecast struct {
-	Year       int        `bson:"year"                 json:"year"`
-	YieldTph   *float64   `bson:"yieldTph,omitempty"   json:"yieldTph,omitempty"`
-	NDVIPeak   *float64   `bson:"ndviPeak,omitempty"   json:"ndviPeak,omitempty"`
-	NDVIPeakAt *time.Time `bson:"ndviPeakAt,omitempty" json:"ndviPeakAt,omitempty"`
-	Model      string     `bson:"model,omitempty"      json:"model,omitempty"`
-	Confidence *float64   `bson:"confidence,omitempty" json:"confidence,omitempty"`
+	Year            int        `bson:"year"                 json:"year"`
+	YieldTph        *float64   `bson:"yieldTph,omitempty"   json:"yieldTph,omitempty"`
+	YieldModel      string     `bson:"yieldModel,omitempty" json:"yieldModel,omitempty"`
+	YieldConfidence *float64   `bson:"yieldConfidence,omitempty" json:"yieldConfidence,omitempty"`
+	NDVIPeak        *float64   `bson:"ndviPeak,omitempty"   json:"ndviPeak,omitempty"`
+	NDVIPeakAt      *time.Time `bson:"ndviPeakAt,omitempty" json:"ndviPeakAt,omitempty"`
+	NDVIStartAt     *time.Time `bson:"ndviStartAt,omitempty" json:"ndviStartAt,omitempty"`
+	NDVIEndAt       *time.Time `bson:"ndviEndAt,omitempty" json:"ndviEndAt,omitempty"`
+	NDVIModel       string     `bson:"ndviModel,omitempty"      json:"ndviModel,omitempty"`
+	NDVIConfidence  *float64   `bson:"ndviConfidence,omitempty" json:"ndviConfidence,omitempty"`
 }

api/openapi.yaml

@@ -73,6 +73,9 @@ components:
           type: string
           format: date-time
           description: RFC3339 timestamp
+        type:
+          type: integer
+          description: 0 = actual, 1 = forecast
         ndvi:
           type: number
           format: float
@@ -123,9 +126,23 @@ components:
           type: string
           format: date-time
           nullable: true
-        model:
+        yieldModel:
+          type: string
+        yieldConfidence:
+          type: number
+          format: float
+          nullable: true
+        ndviStartAt:
+          type: string
+          format: date-time
+          nullable: true
+        ndviEndAt:
+          type: string
+          format: date-time
+          nullable: true
+        ndviModel:
           type: string
-        confidence:
+        ndviConfidence:
           type: number
           format: float
           nullable: true
@@ -175,6 +192,23 @@ components:
             items:
               $ref: '#/components/schemas/YieldEntry'
 
+    UpdateFieldReq:
+      type: object
+      description: Partial update; no required fields. Any provided field will be updated.
+      properties:
+        name: { type: string }
+        geometry:
+          type: object
+          description: GeoJSON Polygon or MultiPolygon (raw JSON)
+        areaHa: { type: number, format: float }
+        notes: { type: string }
+        crop: { type: string }
+        photo: { type: string }
+        yields:
+          type: array
+          items:
+            $ref: '#/components/schemas/YieldEntry'
+
     ProcessorReportReq:
       type: object
       properties:
@@ -304,7 +338,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/CreateFieldReq'
+              $ref: '#/components/schemas/UpdateFieldReq'
       responses:
         '200':
           description: Updated field