Change LIMIT_RECORD_COUNT_PER_NAMESPACE to LIMIT_RECORD_COUNT_PER_MODULE

cortezaproject · Jan 8, 2025 · 6c60464 · 6c60464
1 parent 7eb367a
commit 6c60464
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/server/.env.example b/server/.env.example
@@ -811,10 +811,10 @@
 # LIMIT_SYSTEM_USERS=<no value>
 
 ###############################################################################
-# Maximum number of records per namespace
+# Maximum number of records per module
 # Type:    int
 # Default: <no value>
-# LIMIT_RECORD_COUNT_PER_NAMESPACE=<no value>
+# LIMIT_RECORD_COUNT_PER_MODULE=<no value>
 
 ###############################################################################
 ###############################################################################

diff --git a/server/app/options/limit.cue b/server/app/options/limit.cue
@@ -11,9 +11,9 @@ limit: schema.#optionsGroup & {
 			type:        "int"
 			description: "Maximum number of valid (not deleted, not suspended) users"
 		}
-		record_count_per_namespace: {
+		record_count_per_module: {
 			type: "int"
-			description:  "Maximum number of records per namespace"
+			description:  "Maximum number of records per module"
 		}
 	}
 	title: "Limits"

diff --git a/server/compose/service/record.go b/server/compose/service/record.go
@@ -908,7 +908,7 @@ func (svc record) checkLimit(ctx context.Context, m *types.Module) (err error) {
 	// get the number of records count for the namespace
 	recordsCount, err := dalutils.ComposeRecordsCount(ctx, svc.dal, m, types.RecordFilter{
 		NamespaceID: m.NamespaceID,
-		ModuleID:    0,
+		ModuleID:    m.ID,
 	})
 	if err != nil {
 		return err

diff --git a/server/compose/service/service.go b/server/compose/service/service.go
@@ -186,7 +186,7 @@ func Initialize(ctx context.Context, log *zap.Logger, s store.Storer, c Config)
 	DefaultModule = Module(c.SchemaAltManager)
 
 	DefaultImportSession = ImportSession()
-	DefaultRecord = Record(RecordOptions{LimitRecords: c.Limit.RecordCountPerNamespace})
+	DefaultRecord = Record(RecordOptions{LimitRecords: c.Limit.RecordCountPerModule})
 	DefaultPage = Page()
 	DefaultPageLayout = PageLayout()
 	DefaultChart = Chart()

diff --git a/server/federation/rest/sync_data.go b/server/federation/rest/sync_data.go
@@ -3,11 +3,12 @@ package rest
 import (
 	"context"
 	"fmt"
-	"github.com/cortezaproject/corteza/server/pkg/options"
 	"net/http"
 	"strings"
 	"time"
 
+	"github.com/cortezaproject/corteza/server/pkg/options"
+
 	cs "github.com/cortezaproject/corteza/server/compose/service"
 	ct "github.com/cortezaproject/corteza/server/compose/types"
 	"github.com/cortezaproject/corteza/server/federation/rest/request"
@@ -100,7 +101,7 @@ func (ctrl SyncData) ReadExposedAll(ctx context.Context, r *request.SyncDataRead
 
 		// todo - handle error properly
 		// @todo !!!
-		if list, _, err := (cs.Record(cs.RecordOptions{LimitRecords: ctrl.opts.RecordCountPerNamespace})).Find(ctx, rf); err != nil || len(list) == 0 {
+		if list, _, err := (cs.Record(cs.RecordOptions{LimitRecords: ctrl.opts.RecordCountPerModule})).Find(ctx, rf); err != nil || len(list) == 0 {
 			continue
 		}
 
@@ -228,7 +229,7 @@ func (ctrl SyncData) readExposed(ctx context.Context, r *request.SyncDataReadExp
 	}
 
 	// @todo !!!
-	list, f, err := (cs.Record(cs.RecordOptions{LimitRecords: ctrl.opts.RecordCountPerNamespace})).Find(ctx, f)
+	list, f, err := (cs.Record(cs.RecordOptions{LimitRecords: ctrl.opts.RecordCountPerModule})).Find(ctx, f)
 
 	if err != nil {
 		return nil, err

diff --git a/server/pkg/options/options.gen.go b/server/pkg/options/options.gen.go