fixup! modify care team confirmation context for alerting

models/confirmation.go

@@ -278,34 +278,33 @@ type CareTeamContext struct {
 // If the API is migrated so this custom unmarshaler isn't necessary, that
 // would be a good thing.
 func (e *CareTeamContext) UnmarshalJSON(b []byte) error {
-	const permissionsKey string = "permissions"
-	const alertsConfigKey string = "alertsConfig"
+	// noCustomUnmarshaler temporarily disables the custom JSON unmarshaler.
+	type noCustomUnmarshaler struct {
+		CareTeamContext
+		UnmarshalJSON struct{} `json:"-"`
+	}
 
-	generic := map[string]json.RawMessage{}
+	generic := &noCustomUnmarshaler{}
 	if err := json.Unmarshal(b, &generic); err != nil {
 		return fmt.Errorf("unmarshaling Confirmation Context: %w", err)
 	}
-	if genericAlertsConfig := generic[alertsConfigKey]; genericAlertsConfig != nil {
-		if err := json.Unmarshal(genericAlertsConfig, &e.AlertsConfig); err != nil {
-			return fmt.Errorf("unmarshaling AlertsConfig: %w", err)
-		}
-		delete(generic, alertsConfigKey)
+	if generic.AlertsConfig != nil {
+		e.AlertsConfig = generic.AlertsConfig
 	}
-	if genericPermissions := generic[permissionsKey]; genericPermissions != nil {
-		if err := json.Unmarshal(genericPermissions, &e.Permissions); err != nil {
-			return fmt.Errorf("unmarshaling hybrid Permissions: %w", err)
-		}
-		delete(generic, permissionsKey)
+	if generic.Nickname != nil && *generic.Nickname != "" {
+		e.Nickname = generic.Nickname
+	}
+	if generic.Permissions != nil {
+		e.Permissions = generic.Permissions
 	} else {
-		e.Permissions = clients.Permissions{}
-		for k := range generic {
-			perm := clients.Permission{}
-			err := json.Unmarshal(generic[k], &perm)
-			if err != nil {
-				return fmt.Errorf("unmarshaling Permissions: %w", err)
-			}
-			e.Permissions[k] = perm
+		// As there's no permissions key, this must be an older context.
+		if err := json.Unmarshal(b, &e.Permissions); err != nil {
+			return fmt.Errorf("unmarshaling Permissions: %w", err)
 		}
+		// Alternatively, one could unmarshal into a map, and iterate over it,
+		// copying fields that don't match these below.
+		delete(e.Permissions, "alertsConfig")
+		delete(e.Permissions, "nickname")
 	}
 
 	return nil