HYPERFLEET-841 - refactor: move condition status

validation to model layer

Author: pnguyen44

pkg/api/presenters/adapter_status.go

@@ -10,15 +10,6 @@ import (
 	"gorm.io/datatypes"
 )
 
-func isValidAdapterConditionStatus(status api.AdapterConditionStatus) bool {
-	switch status {
-	case api.AdapterConditionTrue, api.AdapterConditionFalse, api.AdapterConditionUnknown:
-		return true
-	default:
-		return false
-	}
-}
-
 // ConvertAdapterStatus converts openapi.AdapterStatusCreateRequest to api.AdapterStatus (GORM model)
 func ConvertAdapterStatus(
 	resourceType, resourceID string,
@@ -95,7 +86,7 @@ func PresentAdapterStatus(adapterStatus *api.AdapterStatus) (openapi.AdapterStat
 	// conditions with empty/invalid status (legacy data before validation was added).
 	openapiConditions := make([]openapi.AdapterCondition, 0, len(conditions))
 	for _, cond := range conditions {
-		if !isValidAdapterConditionStatus(cond.Status) {
+		if !cond.Status.IsValid() {
 			continue
 		}
 		openapiConditions = append(openapiConditions, openapi.AdapterCondition{

pkg/api/status_types.go

@@ -21,6 +21,11 @@ const (
 	AdapterConditionUnknown AdapterConditionStatus = "Unknown"
 )
 
+// IsValid returns true if the status is one of the accepted enum values (True, False, Unknown).
+func (s AdapterConditionStatus) IsValid() bool {
+	return s == AdapterConditionTrue || s == AdapterConditionFalse || s == AdapterConditionUnknown
+}
+
 // Condition type constants
 const (
 	ConditionTypeAvailable  = "Available"

pkg/api/status_types_test.go

@@ -33,6 +33,19 @@ func TestAdapterConditionStatus_Constants(t *testing.T) {
 	// which has "True", "False", and "Unknown" values
 }
 
+// TestAdapterConditionStatus_IsValid verifies that IsValid accepts valid statuses and rejects invalid ones
+func TestAdapterConditionStatus_IsValid(t *testing.T) {
+	RegisterTestingT(t)
+
+	Expect(AdapterConditionTrue.IsValid()).To(BeTrue())
+	Expect(AdapterConditionFalse.IsValid()).To(BeTrue())
+	Expect(AdapterConditionUnknown.IsValid()).To(BeTrue())
+
+	Expect(AdapterConditionStatus("").IsValid()).To(BeFalse())
+	Expect(AdapterConditionStatus("garbage").IsValid()).To(BeFalse())
+	Expect(AdapterConditionStatus("true").IsValid()).To(BeFalse())
+}
+
 // TestAdapterConditionStatus_StringConversion tests type casting to/from string
 func TestAdapterConditionStatus_StringConversion(t *testing.T) {
 	RegisterTestingT(t)