Refactor and update mock implementations; enhance error handling and response structures

Signed-off-by: rafi <refaei.shikho@hotmail.com>

Author: refoo0

controllers/org_controller.go

@@ -65,7 +65,7 @@ func (controller *OrgController) Create(ctx shared.Context) error {
 		settings = shared.InstanceSettings{}
 	}
 	if settings.SingleOrganizationMode {
-		return echo.NewHTTPError(400, "creating organizations is not allowed in single organization mode")
+		return echo.NewHTTPError(403, "creating organizations is not allowed in single organization mode")
 	}
 
 	var req dtos.OrgCreateRequest

controllers/org_controller_test.go

@@ -257,8 +257,7 @@ func TestCreate(t *testing.T) {
 		e := echo.New()
 		ctx := e.NewContext(req, httptest.NewRecorder())
 
-		h := NewOrganizationController(nil, nil, nil, nil, nil)
-
+		h := NewOrganizationController(nil, nil, nil, nil, nil, nil)
 		err := h.Create(ctx)
 		if err == nil {
 			t.Fail()
@@ -272,7 +271,7 @@ func TestCreate(t *testing.T) {
 
 		shared.SetOrg(ctx, models.Org{Name: "fantasy", Slug: "fantasy"})
 
-		h := NewOrganizationController(nil, nil, nil, nil, nil)
+		h := NewOrganizationController(nil, nil, nil, nil, nil, nil)
 
 		err := h.Create(ctx)
 		if err == nil {
@@ -286,7 +285,7 @@ func TestCreate(t *testing.T) {
 		e := echo.New()
 		ctx := e.NewContext(req, httptest.NewRecorder())
 
-		h := NewOrganizationController(nil, nil, nil, nil, nil)
+		h := NewOrganizationController(nil, nil, nil, nil, nil, nil)
 
 		err := h.Create(ctx)
 		if err == nil {

daemons/daemon.go

@@ -75,17 +75,16 @@ func (runner *DaemonRunner) SetInstanceSettings(ctx context.Context) error {
 		return runner.configService.SetJSONConfig(ctx, "instance_settings", shared.InstanceSettings{
 			SingleOrganizationMode: true,
 		})
+	} else {
+		return runner.configService.SetJSONConfig(ctx, "instance_settings", shared.InstanceSettings{
+			SingleOrganizationMode: false,
+		})
 	}
-	return nil
 }
 
 func (runner *DaemonRunner) runDaemons() {
 	ctx := context.Background()
 
-	if err := runner.SetInstanceSettings(ctx); err != nil {
-		slog.Error("could not set instance settings", "err", err)
-	}
-
 	if err := runner.maybeRunAndMark("maintain.cleanup", func() error {
 		return runner.CleanupOrphanedRecords(ctx)
 	}); err != nil {

daemons/providers.go

@@ -152,6 +152,10 @@ func (runner *DaemonRunner) Start(ctx context.Context) {
 }
 
 func (runner *DaemonRunner) tick() {
+	if err := runner.SetInstanceSettings(context.Background()); err != nil {
+		slog.Error("could not set instance settings", "err", err)
+	}
+
 	if runner.leaderElector.IsLeader() {
 		slog.Info("this instance is the leader - running background jobs")
 		runner.runDaemons()