Implemented data module message handlers, with full set of tests. Res…

…ulted in some standardisation/consts for user in other handlers. Uses latest data-formats
pixlise · Aug 1, 2023 · 845696a · 845696a
1 parent 2e2c1ed
commit 845696a
Show file tree

Hide file tree

Showing 10 changed files with 875 additions and 18 deletions.
diff --git a/api/ws/handlers/expression-group.go b/api/ws/handlers/expression-group.go
@@ -75,7 +75,7 @@ func validateExpressionGroup(egroup *protos.ExpressionGroup) error {
 	if err := wsHelpers.CheckStringField(&egroup.Description, "Description", 0, wsHelpers.DescriptionFieldMaxLength); err != nil {
 		return err
 	}
-	if err := wsHelpers.CheckFieldLength(egroup.Tags, "Tags", 0, 10); err != nil {
+	if err := wsHelpers.CheckFieldLength(egroup.Tags, "Tags", 0, wsHelpers.TagListMaxLength); err != nil {
 		return err
 	}
 	if err := wsHelpers.CheckFieldLength(egroup.GroupItems, "GroupItems", 2, 5); err != nil {

diff --git a/api/ws/handlers/expression.go b/api/ws/handlers/expression.go
@@ -84,16 +84,13 @@ func validateExpression(expr *protos.DataExpression) error {
 	if err := wsHelpers.CheckStringField(&expr.Comments, "Comments", 0, wsHelpers.DescriptionFieldMaxLength); err != nil {
 		return err
 	}
-	if err := wsHelpers.CheckStringField(&expr.SourceCode, "SourceCode", 1, 1024*1024*5); err != nil {
+	if err := wsHelpers.CheckStringField(&expr.SourceCode, "SourceCode", 1, wsHelpers.SourceCodeMaxLength); err != nil {
 		return err
 	}
 	if expr.SourceLanguage != "LUA" && expr.SourceLanguage != "PIXLANG" {
 		return errors.New("Invalid source language: " + expr.SourceLanguage)
 	}
-	if err := wsHelpers.CheckStringField(&expr.SourceLanguage, "SourceCode", 1, 1024*1024*5); err != nil {
-		return err
-	}
-	if err := wsHelpers.CheckFieldLength(expr.Tags, "Tags", 0, 10); err != nil {
+	if err := wsHelpers.CheckFieldLength(expr.Tags, "Tags", 0, wsHelpers.TagListMaxLength); err != nil {
 		return err
 	}
 	if err := wsHelpers.CheckFieldLength(expr.ModuleReferences, "ModuleReferences", 0, 10); err != nil {