Fix unit tests

Author: brionmario

backend/.mockery.private.yml

@@ -157,20 +157,28 @@ packages:
       pkgname: security
       filename: "{{.InterfaceName}}_mock_test.go"
 
-  github.com/asgardeo/thunder/internal/branding/mgt:
+  github.com/asgardeo/thunder/internal/design/theme/mgt:
     config:
       all: true
-      dir: internal/branding/mgt
+      dir: internal/design/theme/mgt
       structname: '{{.InterfaceName}}Mock'
-      pkgname: brandingmgt
+      pkgname: thememgt
       filename: "{{.InterfaceName}}_mock_test.go"
 
-  github.com/asgardeo/thunder/internal/branding/resolve:
+  github.com/asgardeo/thunder/internal/design/layout/mgt:
     config:
       all: true
-      dir: internal/branding/resolve
+      dir: internal/design/layout/mgt
       structname: '{{.InterfaceName}}Mock'
-      pkgname: brandingresolve
+      pkgname: layoutmgt
+      filename: "{{.InterfaceName}}_mock_test.go"
+
+  github.com/asgardeo/thunder/internal/design/resolve:
+    config:
+      all: true
+      dir: internal/design/resolve
+      structname: '{{.InterfaceName}}Mock'
+      pkgname: designresolve
       filename: "{{.InterfaceName}}_mock_test.go"
 
   github.com/asgardeo/thunder/internal/oauth/oauth2/userinfo:

backend/.mockery.public.yml

@@ -349,12 +349,20 @@ packages:
       pkgname: observabilitymock
       filename: "{{.InterfaceName}}_mock.go"
 
-  github.com/asgardeo/thunder/internal/branding/mgt:
+  github.com/asgardeo/thunder/internal/design/theme/mgt:
     config:
       all: true
-      dir: tests/mocks/brandingmock
+      dir: tests/mocks/design/thememock
       structname: '{{.InterfaceName}}Mock'
-      pkgname: brandingmock
+      pkgname: thememock
+      filename: "{{.InterfaceName}}_mock.go"
+
+  github.com/asgardeo/thunder/internal/design/layout/mgt:
+    config:
+      all: true
+      dir: tests/mocks/design/layoutmock
+      structname: '{{.InterfaceName}}Mock'
+      pkgname: layoutmock
       filename: "{{.InterfaceName}}_mock.go"
 
   github.com/asgardeo/thunder/internal/system/crypto/hash:

backend/internal/application/error_constants.go

@@ -201,32 +201,24 @@ var (
 		Error:            "Invalid user type",
 		ErrorDescription: "One or more user types in allowed_user_types do not exist in the system",
 	}
-	// ErrorBrandingNotFound is the error returned when branding is not found.
-	// DEPRECATED: Use ErrorThemeNotFound and ErrorLayoutNotFound instead
-	ErrorBrandingNotFound = serviceerror.ServiceError{
-		Type:             serviceerror.ClientErrorType,
-		Code:             "APP-1026",
-		Error:            "Branding not found",
-		ErrorDescription: "The specified branding configuration does not exist",
-	}
 	// ErrorThemeNotFound is the error returned when theme is not found.
 	ErrorThemeNotFound = serviceerror.ServiceError{
 		Type:             serviceerror.ClientErrorType,
-		Code:             "APP-1027",
+		Code:             "APP-1026",
 		Error:            "Theme not found",
 		ErrorDescription: "The specified theme configuration does not exist",
 	}
 	// ErrorLayoutNotFound is the error returned when layout is not found.
 	ErrorLayoutNotFound = serviceerror.ServiceError{
 		Type:             serviceerror.ClientErrorType,
-		Code:             "APP-1028",
+		Code:             "APP-1027",
 		Error:            "Layout not found",
 		ErrorDescription: "The specified layout configuration does not exist",
 	}
 	// ErrorWhileRetrievingFlowDefinition is the error returned when there is an issue retrieving flow definition.
 	ErrorWhileRetrievingFlowDefinition = serviceerror.ServiceError{
 		Type:             serviceerror.ClientErrorType,
-		Code:             "APP-1029",
+		Code:             "APP-1028",
 		Error:            "Error retrieving flow definition",
 		ErrorDescription: "An error occurred while retrieving the flow definition",
 	}

backend/internal/application/init_test.go

@@ -27,7 +27,6 @@ import (
 	"github.com/asgardeo/thunder/internal/cert"
 	oauth2const "github.com/asgardeo/thunder/internal/oauth/oauth2/constants"
 	"github.com/asgardeo/thunder/internal/system/config"
-	"github.com/asgardeo/thunder/tests/mocks/brandingmock"
 	"github.com/asgardeo/thunder/tests/mocks/certmock"
 	"github.com/asgardeo/thunder/tests/mocks/flow/flowmgtmock"
 	"github.com/asgardeo/thunder/tests/mocks/userschemamock"
@@ -46,14 +45,12 @@ type InitTestSuite struct {
 	suite.Suite
 	mockCertService       *certmock.CertificateServiceInterfaceMock
 	mockFlowMgtService    *flowmgtmock.FlowMgtServiceInterfaceMock
-	mockBrandingService   *brandingmock.BrandingMgtServiceInterfaceMock
 	mockUserSchemaService *userschemamock.UserSchemaServiceInterfaceMock
 }
 
 func (suite *InitTestSuite) SetupTest() {
 	suite.mockCertService = certmock.NewCertificateServiceInterfaceMock(suite.T())
 	suite.mockFlowMgtService = flowmgtmock.NewFlowMgtServiceInterfaceMock(suite.T())
-	suite.mockBrandingService = brandingmock.NewBrandingMgtServiceInterfaceMock(suite.T())
 	suite.mockUserSchemaService = userschemamock.NewUserSchemaServiceInterfaceMock(suite.T())
 }
 
@@ -85,6 +82,8 @@ func (suite *InitTestSuite) TestInitialize_WithDeclarativeResourcesDisabled() {
 		mux,
 		suite.mockCertService,
 		suite.mockFlowMgtService,
+		nil, // themeMgtService - not needed for this test
+		nil, // layoutMgtService - not needed for this test
 		suite.mockUserSchemaService,
 	)
 
@@ -475,11 +474,17 @@ func TestInitialize_Standalone(t *testing.T) {
 	mux := http.NewServeMux()
 	mockCertService := certmock.NewCertificateServiceInterfaceMock(t)
 	mockFlowMgtService := flowmgtmock.NewFlowMgtServiceInterfaceMock(t)
-	mockBrandingService := brandingmock.NewBrandingMgtServiceInterfaceMock(t)
 	mockUserSchemaService := userschemamock.NewUserSchemaServiceInterfaceMock(t)
 
 	// Execute
-	service, _, err := Initialize(mux, mockCertService, mockFlowMgtService, mockUserSchemaService)
+	service, _, err := Initialize(
+		mux,
+		mockCertService,
+		mockFlowMgtService,
+		nil, // themeMgtService - not needed for this test
+		nil, // layoutMgtService - not needed for this test
+		mockUserSchemaService,
+	)
 
 	// Assert
 	assert.NoError(t, err)
@@ -515,11 +520,17 @@ func TestInitialize_WithDeclarativeResources_Standalone(t *testing.T) {
 	mux := http.NewServeMux()
 	mockCertService := certmock.NewCertificateServiceInterfaceMock(t)
 	mockFlowMgtService := flowmgtmock.NewFlowMgtServiceInterfaceMock(t)
-	mockBrandingService := brandingmock.NewBrandingMgtServiceInterfaceMock(t)
 	mockUserSchemaService := userschemamock.NewUserSchemaServiceInterfaceMock(t)
 
 	// Execute
-	service, _, err := Initialize(mux, mockCertService, mockFlowMgtService, mockUserSchemaService)
+	service, _, err := Initialize(
+		mux,
+		mockCertService,
+		mockFlowMgtService,
+		nil, // themeMgtService - not needed for this test
+		nil, // layoutMgtService - not needed for this test
+		mockUserSchemaService,
+	)
 
 	// Assert
 	assert.NoError(t, err)

backend/internal/design/layout/mgt/handler.go

@@ -61,17 +61,16 @@ func (lh *layoutMgtHandler) HandleLayoutListRequest(w http.ResponseWriter, r *ht
 		return
 	}
 
-	layouts := make([]Layout, 0, len(layoutList.Layouts))
+	layouts := make([]LayoutListItem, 0, len(layoutList.Layouts))
 	for _, layout := range layoutList.Layouts {
-		layouts = append(layouts, Layout{
+		layouts = append(layouts, LayoutListItem{
 			ID:          layout.ID,
 			DisplayName: layout.DisplayName,
 			Description: layout.Description,
-			Layout:      layout.Layout,
 		})
 	}
 
-	layoutListResponse := &LayoutListResponseWithFullLayouts{
+	layoutListResponse := &LayoutListResponse{
 		TotalResults: layoutList.TotalResults,
 		StartIndex:   layoutList.StartIndex,
 		Count:        layoutList.Count,