include unit tests

Author: tharindu1st

platform-api/src/api/generated.go

@@ -125,7 +125,7 @@ type WebSubAPIDeploymentSpec struct {
 	Version         string                          `yaml:"version"`
 	Context         string                          `yaml:"context"`
 	Vhosts          *WebSubAPIDeploymentVhosts      `yaml:"vhosts,omitempty"`
-	AllChannels     *WebSubDeployAllChannelPolicies `json:"allChannels,omitempty"`
+	AllChannels     *WebSubDeployAllChannelPolicies `yaml:"allChannels,omitempty"`
 	Receiver        *WebSubDeployReceiver           `yaml:"receiver,omitempty"`
 	Hub             *WebSubDeployHub                `yaml:"hub,omitempty"`
 	Delivery        *WebSubDeployDelivery           `yaml:"delivery,omitempty"`
@@ -153,19 +153,15 @@ type WebSubDeployAllChannelPolicies struct {
 	OnMessageDelivery *WebSubDeployEventPolicies `yaml:"on_message_delivery,omitempty"`
 }
 
-// WebSubDeployChannelPolicies represents per-channel policies in the deployment YAML, organized by event type.
-type WebSubDeployChannelPolicies struct {
+// WebSubDeployChannel represents a single channel entry in the deployment YAML.
+// Event policies are at the top level to match the gateway-controller's WebSubChannel schema.
+type WebSubDeployChannel struct {
 	OnSubscription    *WebSubDeployEventPolicies `yaml:"on_subscription,omitempty"`
 	OnUnsubscription  *WebSubDeployEventPolicies `yaml:"on_unsubscription,omitempty"`
 	OnMessageReceived *WebSubDeployEventPolicies `yaml:"on_message_received,omitempty"`
 	OnMessageDelivery *WebSubDeployEventPolicies `yaml:"on_message_delivery,omitempty"`
 }
 
-// WebSubDeployChannel represents a single channel entry in the deployment YAML.
-type WebSubDeployChannel struct {
-	Policies *WebSubDeployChannelPolicies `yaml:"policies,omitempty"`
-}
-
 // WebSubDeployReceiver represents the receiver section in the deployment YAML.
 type WebSubDeployReceiver struct {
 	Policies []Policy `yaml:"policies"`

platform-api/src/internal/model/deployment.go

@@ -144,7 +144,7 @@ func (s *WebSubAPIService) Create(orgUUID, createdBy string, req *api.WebSubAPI)
 			Context:           req.Context,
 			Channels:          mapWebSubChannelsAPIToModel(req.Channels),
 			Upstream:          *mapUpstreamAPIToModel(req.Upstream),
-			AllChannels:       mapWebSubAllChannelPoliciesAPIToModel(req.AllChannels),
+			AllChannels:       mapWebSubPoliciesAPIToAllChannels(req.Policies),
 			SubscriptionPlans: subscriptionPlans,
 		},
 	}
@@ -259,7 +259,7 @@ func (s *WebSubAPIService) Update(orgUUID, handle string, req *api.WebSubAPI) (*
 		Context:           req.Context,
 		Channels:          mapWebSubChannelsAPIToModel(req.Channels),
 		Upstream:          *mapUpstreamAPIToModel(req.Upstream),
-		AllChannels:       mapWebSubAllChannelPoliciesAPIToModel(req.AllChannels),
+		AllChannels:       mapWebSubPoliciesAPIToAllChannels(req.Policies),
 		SubscriptionPlans: subscriptionPlans,
 	}
 
@@ -415,7 +415,7 @@ func mapWebSubAPIModelToAPI(m *model.WebSubAPI, apiUtil *utils.APIUtil) *api.Web
 		Context:           m.Configuration.Context,
 		Upstream:          mapUpstreamModelToAPI(&m.Configuration.Upstream),
 		Channels:          mapWebSubChannelsModelToAPI(m.Configuration.Channels),
-		AllChannels:       mapWebSubAllChannelPoliciesModelToAPI(m.Configuration.AllChannels),
+		Policies:          mapAllChannelsModelToWebSubPolicies(m.Configuration.AllChannels),
 		SubscriptionPlans: subscriptionPlans,
 		CreatedAt:         utils.TimePtr(m.CreatedAt),
 		UpdatedAt:         utils.TimePtr(m.UpdatedAt),
@@ -431,11 +431,15 @@ func mapWebSubChannelsAPIToModel(in *map[string]api.WebSubChannel) map[string]mo
 	}
 	out := make(map[string]model.WebSubChannel, len(*in))
 	for name, ch := range *in {
+		var p *api.WebSubChannelPolicies
+		if ch.Policies != nil {
+			p = ch.Policies
+		}
 		out[name] = model.WebSubChannel{
-			OnSubscription:    mapEventPoliciesAPIToModel(ch.OnSubscription),
-			OnUnsubscription:  mapEventPoliciesAPIToModel(ch.OnUnsubscription),
-			OnMessageReceived: mapEventPoliciesAPIToModel(ch.OnMessageReceived),
-			OnMessageDelivery: mapEventPoliciesAPIToModel(ch.OnMessageDelivery),
+			OnSubscription:    policySlicePtrToEventPolicies(policySlicePtrFromChannelPolicies(p, "on_subscription")),
+			OnUnsubscription:  policySlicePtrToEventPolicies(policySlicePtrFromChannelPolicies(p, "on_unsubscription")),
+			OnMessageReceived: policySlicePtrToEventPolicies(policySlicePtrFromChannelPolicies(p, "on_message_received")),
+			OnMessageDelivery: policySlicePtrToEventPolicies(policySlicePtrFromChannelPolicies(p, "on_message_delivery")),
 		}
 	}
 	return out
@@ -457,10 +461,10 @@ func mapWebSubChannelPoliciesAPIToModel(in *api.WebSubChannelPolicies) *model.We
 		return nil
 	}
 	return &model.WebSubChannelPolicies{
-		OnSubscription:    mapEventPoliciesAPIToModel(in.OnSubscription),
-		OnUnsubscription:  mapEventPoliciesAPIToModel(in.OnUnsubscription),
-		OnMessageReceived: mapEventPoliciesAPIToModel(in.OnMessageReceived),
-		OnMessageDelivery: mapEventPoliciesAPIToModel(in.OnMessageDelivery),
+		OnSubscription:    policySlicePtrToEventPolicies(in.OnSubscription),
+		OnUnsubscription:  policySlicePtrToEventPolicies(in.OnUnsubscription),
+		OnMessageReceived: policySlicePtrToEventPolicies(in.OnMessageReceived),
+		OnMessageDelivery: policySlicePtrToEventPolicies(in.OnMessageDelivery),
 	}
 }
 
@@ -477,6 +481,80 @@ func mapWebSubAllChannelPoliciesAPIToModel(in *api.WebSubAllChannelPolicies) *mo
 	}
 }
 
+// mapWebSubPoliciesAPIToAllChannels converts flat WebSubChannelPolicies (from API) to model.WebSubAllChannelPolicies (for storage).
+func mapWebSubPoliciesAPIToAllChannels(in *api.WebSubChannelPolicies) *model.WebSubAllChannelPolicies {
+	if in == nil {
+		return nil
+	}
+	return &model.WebSubAllChannelPolicies{
+		OnSubscription:    policySlicePtrToEventPolicies(in.OnSubscription),
+		OnUnsubscription:  policySlicePtrToEventPolicies(in.OnUnsubscription),
+		OnMessageReceived: policySlicePtrToEventPolicies(in.OnMessageReceived),
+		OnMessageDelivery: policySlicePtrToEventPolicies(in.OnMessageDelivery),
+	}
+}
+
+// mapAllChannelsModelToWebSubPolicies converts stored model.WebSubAllChannelPolicies to flat WebSubChannelPolicies (for API response).
+func mapAllChannelsModelToWebSubPolicies(in *model.WebSubAllChannelPolicies) *api.WebSubChannelPolicies {
+	if in == nil {
+		return nil
+	}
+	return &api.WebSubChannelPolicies{
+		OnSubscription:    eventPoliciesToPolicySlicePtr(in.OnSubscription),
+		OnUnsubscription:  eventPoliciesToPolicySlicePtr(in.OnUnsubscription),
+		OnMessageReceived: eventPoliciesToPolicySlicePtr(in.OnMessageReceived),
+		OnMessageDelivery: eventPoliciesToPolicySlicePtr(in.OnMessageDelivery),
+	}
+}
+
+// policySlicePtrToEventPolicies wraps a flat policy slice pointer into a model.WebSubEventPolicies.
+func policySlicePtrToEventPolicies(in *[]api.Policy) *model.WebSubEventPolicies {
+	if in == nil {
+		return nil
+	}
+	policies := make([]model.Policy, 0, len(*in))
+	for _, p := range *in {
+		policy := model.Policy{
+			Name:    p.Name,
+			Version: p.Version,
+		}
+		if p.ExecutionCondition != nil {
+			policy.ExecutionCondition = p.ExecutionCondition
+		}
+		if p.Params != nil {
+			policy.Params = p.Params
+		}
+		policies = append(policies, policy)
+	}
+	return &model.WebSubEventPolicies{Policies: policies}
+}
+
+// eventPoliciesToPolicySlicePtr converts a model.WebSubEventPolicies to a flat policy slice pointer.
+func eventPoliciesToPolicySlicePtr(in *model.WebSubEventPolicies) *[]api.Policy {
+	if in == nil || len(in.Policies) == 0 {
+		return nil
+	}
+	return mapModelPolicySliceToAPI(in.Policies)
+}
+
+// policySlicePtrFromChannelPolicies extracts the policy slice for a given event type from WebSubChannelPolicies.
+func policySlicePtrFromChannelPolicies(p *api.WebSubChannelPolicies, event string) *[]api.Policy {
+	if p == nil {
+		return nil
+	}
+	switch event {
+	case "on_subscription":
+		return p.OnSubscription
+	case "on_unsubscription":
+		return p.OnUnsubscription
+	case "on_message_received":
+		return p.OnMessageReceived
+	case "on_message_delivery":
+		return p.OnMessageDelivery
+	}
+	return nil
+}
+
 // mapWebSubChannelsModelToAPI converts the model channel map to the API channel map.
 func mapWebSubChannelsModelToAPI(in map[string]model.WebSubChannel) *map[string]api.WebSubChannel {
 	if len(in) == 0 {
@@ -485,10 +563,12 @@ func mapWebSubChannelsModelToAPI(in map[string]model.WebSubChannel) *map[string]
 	out := make(map[string]api.WebSubChannel, len(in))
 	for name, ch := range in {
 		out[name] = api.WebSubChannel{
-			OnSubscription:    mapEventPoliciesModelToAPI(ch.OnSubscription),
-			OnUnsubscription:  mapEventPoliciesModelToAPI(ch.OnUnsubscription),
-			OnMessageReceived: mapEventPoliciesModelToAPI(ch.OnMessageReceived),
-			OnMessageDelivery: mapEventPoliciesModelToAPI(ch.OnMessageDelivery),
+			Policies: &api.WebSubChannelPolicies{
+				OnSubscription:    eventPoliciesToPolicySlicePtr(ch.OnSubscription),
+				OnUnsubscription:  eventPoliciesToPolicySlicePtr(ch.OnUnsubscription),
+				OnMessageReceived: eventPoliciesToPolicySlicePtr(ch.OnMessageReceived),
+				OnMessageDelivery: eventPoliciesToPolicySlicePtr(ch.OnMessageDelivery),
+			},
 		}
 	}
 	return &out
@@ -510,10 +590,10 @@ func mapWebSubChannelPoliciesModelToAPI(in *model.WebSubChannelPolicies) *api.We
 		return nil
 	}
 	return &api.WebSubChannelPolicies{
-		OnSubscription:    mapEventPoliciesModelToAPI(in.OnSubscription),
-		OnUnsubscription:  mapEventPoliciesModelToAPI(in.OnUnsubscription),
-		OnMessageReceived: mapEventPoliciesModelToAPI(in.OnMessageReceived),
-		OnMessageDelivery: mapEventPoliciesModelToAPI(in.OnMessageDelivery),
+		OnSubscription:    eventPoliciesToPolicySlicePtr(in.OnSubscription),
+		OnUnsubscription:  eventPoliciesToPolicySlicePtr(in.OnUnsubscription),
+		OnMessageReceived: eventPoliciesToPolicySlicePtr(in.OnMessageReceived),
+		OnMessageDelivery: eventPoliciesToPolicySlicePtr(in.OnMessageDelivery),
 	}
 }
 

platform-api/src/internal/service/websub_api.go

@@ -637,25 +637,15 @@ func buildWebSubDeployChannels(channels map[string]model.WebSubChannel) map[stri
 	result := make(map[string]model.WebSubDeployChannel, len(channels))
 	for name, ch := range channels {
 		result[name] = model.WebSubDeployChannel{
-			Policies: buildWebSubDeployChannelPoliciesFromChannel(ch),
+			OnSubscription:    generateEventPolicyList(ch.OnSubscription),
+			OnUnsubscription:  generateEventPolicyList(ch.OnUnsubscription),
+			OnMessageReceived: generateEventPolicyList(ch.OnMessageReceived),
+			OnMessageDelivery: generateEventPolicyList(ch.OnMessageDelivery),
 		}
 	}
 	return result
 }
 
-// buildWebSubDeployChannelPoliciesFromChannel converts a model channel to deployment channel policies.
-func buildWebSubDeployChannelPoliciesFromChannel(ch model.WebSubChannel) *model.WebSubDeployChannelPolicies {
-	if ch.OnSubscription == nil && ch.OnUnsubscription == nil && ch.OnMessageReceived == nil && ch.OnMessageDelivery == nil {
-		return nil
-	}
-	return &model.WebSubDeployChannelPolicies{
-		OnSubscription:    generateEventPolicyList(ch.OnSubscription),
-		OnUnsubscription:  generateEventPolicyList(ch.OnUnsubscription),
-		OnMessageReceived: generateEventPolicyList(ch.OnMessageReceived),
-		OnMessageDelivery: generateEventPolicyList(ch.OnMessageDelivery),
-	}
-}
-
 func generateEventPolicyList(ep *model.WebSubEventPolicies) *model.WebSubDeployEventPolicies {
 	if ep == nil {
 		return nil