updates on the api endpoints on the customer page and more

controllers/hubController.go

@@ -13,6 +13,7 @@ import (
 	"doormile/db"
 	"doormile/dto"
 	"doormile/internal/assignment"
+	"doormile/internal/legs"
 	"doormile/internal/routing"
 	"doormile/models"
 	"doormile/utils"
@@ -70,14 +71,11 @@ func zoneName(pincode string) string {
 }
 
 // haversineKM returns the great-circle distance between two lat/lon points in km.
+// haversineKM stays the name the whole controllers package calls, and now
+// delegates to internal/legs so the route sequencer measures distance with the
+// identical implementation rather than a second copy of it.
 func haversineKM(lat1, lon1, lat2, lon2 float64) float64 {
-	const earthRadiusKM = 6371.0
-	toRad := func(deg float64) float64 { return deg * math.Pi / 180 }
-	dLat := toRad(lat2 - lat1)
-	dLon := toRad(lon2 - lon1)
-	a := math.Sin(dLat/2)*math.Sin(dLat/2) +
-		math.Cos(toRad(lat1))*math.Cos(toRad(lat2))*math.Sin(dLon/2)*math.Sin(dLon/2)
-	return earthRadiusKM * 2 * math.Atan2(math.Sqrt(a), math.Sqrt(1-a))
+	return legs.HaversineKM(lat1, lon1, lat2, lon2)
 }
 
 // humanizeRelativeTime renders a timestamp as "5 min ago" / "2 hrs ago" / "3 days ago".
@@ -315,15 +313,27 @@ func GetHubUnassignedBookings(c *fiber.Ctx) error {
 		var customer models.AppCustomer
 		db.DB.Where("appcustomerid = ?", b.Appcustomerid).First(&customer)
 
+		// What kind of place this is collected from, and which one. A Base/Hub
+		// pickup carries the base id, so the dispatch board can show that the
+		// parcel starts at a base rather than at a customer's door — and the row
+		// the rider app receives carries the same pair.
+		customerName := strings.TrimSpace(customer.Firstname + " " + customer.Lastname)
+		sourceType, sourceID, sourceName, sourceAddress := pickupSource(&b, customerName)
+
 		response = append(response, fiber.Map{
-			"bookingid":        b.Bookingid,
-			"bookingno":        b.Bookingno,
-			"customer_name":    strings.TrimSpace(customer.Firstname + " " + customer.Lastname),
-			"pickup_address":   b.Pickupaddress,
-			"pickup_pincode":   b.Pickuppincode,
-			"delivery_address": b.Deliveryaddress,
-			"parcels":          b.Parcels,
-			"created_at":       b.Createdat,
+			"bookingid":          b.Bookingid,
+			"bookingno":          b.Bookingno,
+			"customer_name":      customerName,
+			"pickup_source_type": sourceType,
+			"sourceid":           sourceID,
+			"pickuplocationid":   sourceID,
+			"pickup_source_name": sourceName,
+			"pickup_address":     sourceAddress,
+			"pickup_pincode":     b.Pickuppincode,
+			"delivery_address":   b.Deliveryaddress,
+			"delivery_pincode":   b.Deliverypincode,
+			"parcels":            b.Parcels,
+			"created_at":         b.Createdat,
 		})
 	}
 
@@ -389,17 +399,25 @@ func GetHubBookingsRange(c *fiber.Ctx) error {
 			}
 		}
 
+		customerName := strings.TrimSpace(customer.Firstname + " " + customer.Lastname)
+		sourceType, sourceID, sourceName, sourceAddress := pickupSource(&b, customerName)
+
 		response = append(response, fiber.Map{
-			"bookingid":        b.Bookingid,
-			"bookingno":        b.Bookingno,
-			"customer_name":    strings.TrimSpace(customer.Firstname + " " + customer.Lastname),
-			"pickup_address":   b.Pickupaddress,
-			"pickup_pincode":   b.Pickuppincode,
-			"delivery_address": b.Deliveryaddress,
-			"parcels":          b.Parcels,
-			"status":           hubBookingDisplayStatus(b.Status, hasMiler),
-			"milername":        milerName,
-			"created_at":       b.Createdat,
+			"bookingid":          b.Bookingid,
+			"bookingno":          b.Bookingno,
+			"customer_name":      customerName,
+			"pickup_source_type": sourceType,
+			"sourceid":           sourceID,
+			"pickuplocationid":   sourceID,
+			"pickup_source_name": sourceName,
+			"pickup_address":     sourceAddress,
+			"pickup_pincode":     b.Pickuppincode,
+			"delivery_address":   b.Deliveryaddress,
+			"delivery_pincode":   b.Deliverypincode,
+			"parcels":            b.Parcels,
+			"status":             hubBookingDisplayStatus(b.Status, hasMiler),
+			"milername":          milerName,
+			"created_at":         b.Createdat,
 		})
 	}
 
@@ -437,6 +455,10 @@ func renderInboundConsignment(cs models.Consignment) fiber.Map {
 		"temperature": "N/A",
 		"status":      cs.Status,
 		"updatedat":   cs.Updatedat,
+		// The physical-receipt fact, distinct from updatedat, which moves on any
+		// write. Null on rows inwarded before this column existed.
+		"inwardedat":     cs.Inwardedat,
+		"inbound_status": "received",
 	}
 }
 
@@ -539,11 +561,18 @@ func CreateInboundScan(c *fiber.Ctx) error {
 		}
 	}
 
+	now := time.Now()
 	consignment.Status = constants.ConsignmentInwardedAtHub
 	consignment.Currenthubid = &hubID
 	consignment.Condition = req.Condition
 	consignment.Shelf = recommendedShelf
-	consignment.Updatedat = time.Now()
+	consignment.Updatedat = now
+	// The inbound scan is a physical receipt, so it stamps the same received-at
+	// fact the rider handover does. Kept first-write-wins: a second scan of the
+	// same parcel must not move the time it actually arrived.
+	if consignment.Inwardedat == nil {
+		consignment.Inwardedat = &now
+	}
 
 	if err := db.DB.Save(&consignment).Error; err != nil {
 		return utils.Internal(c, "failed to update consignment")