v0.0.145

.idea/goext.iml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true" />
+  <component name="Go" enabled="true">
+    <buildTags>
+      <option name="goVersion" value="1.19" />
+    </buildTags>
+  </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />

_data/version.sh

@@ -32,6 +32,8 @@ echo "> Current Version: ${curr_vers}"
 echo "> Next    Version: ${next_ver}"
 echo ""
 
+printf "package goext\n\nconst GoextVersion = \"%s\"\n\nconst GoextVersionTimestamp = \"%s\"\n" "${next_ver}" "$( date +"%Y-%m-%dT%H:%M:%S%z" )" > "goextVersion.go"
+
 git add --verbose .
 
 msg="v${next_ver}"

bfcodegen/enum-generate.go

@@ -3,11 +3,14 @@ package bfcodegen
 import (
 	"errors"
 	"fmt"
+	"gogs.mikescher.com/BlackForestBytes/goext"
 	"gogs.mikescher.com/BlackForestBytes/goext/cmdext"
+	"gogs.mikescher.com/BlackForestBytes/goext/cryptext"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"gogs.mikescher.com/BlackForestBytes/goext/rext"
 	"io"
 	"os"
+	"path"
 	"regexp"
 	"strings"
 	"time"
@@ -32,6 +35,8 @@ var rexEnumDef = rext.W(regexp.MustCompile("^\\s*type\\s+(?P<name>[A-Za-z0-9_]+)
 
 var rexValueDef = rext.W(regexp.MustCompile("^\\s*(?P<name>[A-Za-z0-9_]+)\\s+(?P<type>[A-Za-z0-9_]+)\\s*=\\s*(?P<value>(\"[A-Za-z0-9_:]+\"|[0-9]+))\\s*(//(?P<descr>.*))?.*$"))
 
+var rexChecksumConst = rext.W(regexp.MustCompile("const ChecksumGenerator = \"(?P<cs>[A-Za-z0-9_]*)\""))
+
 func GenerateEnumSpecs(sourceDir string, destFile string) error {
 
 	files, err := os.ReadDir(sourceDir)
@@ -39,17 +44,46 @@ func GenerateEnumSpecs(sourceDir string, destFile string) error {
 		return err
 	}
 
+	oldChecksum := "N/A"
+	if _, err := os.Stat(destFile); !os.IsNotExist(err) {
+		content, err := os.ReadFile(destFile)
+		if err != nil {
+			return err
+		}
+		if m, ok := rexChecksumConst.MatchFirst(string(content)); ok {
+			oldChecksum = m.GroupByName("cs").Value()
+		}
+	}
+
+	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return v.Name() != path.Base(destFile) })
+	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return strings.HasSuffix(v.Name(), ".go") })
+	langext.SortBy(files, func(v os.DirEntry) string { return v.Name() })
+
+	newChecksumStr := goext.GoextVersion
+	for _, f := range files {
+		content, err := os.ReadFile(path.Join(sourceDir, f.Name()))
+		if err != nil {
+			return err
+		}
+		newChecksumStr += "\n" + f.Name() + "\t" + cryptext.BytesSha256(content)
+	}
+
+	newChecksum := cryptext.BytesSha256([]byte(newChecksumStr))
+
+	if newChecksum != oldChecksum {
+		fmt.Printf("[EnumGenerate] Checksum has changed ( %s -> %s ), will generate new file\n\n", oldChecksum, newChecksum)
+	} else {
+		fmt.Printf("[EnumGenerate] Checksum unchanged ( %s ), nothing to do\n", oldChecksum)
+		return nil
+	}
+
 	allEnums := make([]EnumDef, 0)
 
 	pkgname := ""
 
 	for _, f := range files {
-		if !strings.HasSuffix(f.Name(), ".go") {
-			continue
-		}
-
 		fmt.Printf("========= %s =========\n\n", f.Name())
-		fileEnums, pn, err := processFile(f.Name())
+		fileEnums, pn, err := processFile(path.Join(sourceDir, f.Name()))
 		if err != nil {
 			return err
 		}
@@ -67,7 +101,7 @@ func GenerateEnumSpecs(sourceDir string, destFile string) error {
 		return errors.New("no package name found in any file")
 	}
 
-	err = os.WriteFile(destFile, []byte(fmtOutput(allEnums, pkgname)), 0o755)
+	err = os.WriteFile(destFile, []byte(fmtOutput(newChecksum, allEnums, pkgname)), 0o755)
 	if err != nil {
 		return err
 	}
@@ -159,8 +193,8 @@ func processFile(fn string) ([]EnumDef, string, error) {
 	return enums, pkgname, nil
 }
 
-func fmtOutput(enums []EnumDef, pkgname string) string {
+func fmtOutput(cs string, enums []EnumDef, pkgname string) string {
-	str := "// Code generated by permissions_gen.sh DO NOT EDIT.\n"
+	str := "// Code generated by enum-generate.go DO NOT EDIT.\n"
 	str += "\n"
 	str += "package " + pkgname + "\n"
 	str += "\n"
@@ -168,6 +202,9 @@ func fmtOutput(enums []EnumDef, pkgname string) string {
 	str += "import \"gogs.mikescher.com/BlackForestBytes/goext/langext\"" + "\n"
 	str += "\n"
 
+	str += "const ChecksumGenerator = \"" + cs + "\"" + "\n"
+	str += "\n"
+
 	str += "type Enum interface {" + "\n"
 	str += "    Valid() bool" + "\n"
 	str += "    ValuesAny() []any" + "\n"

bfcodegen/enum-generate_test.go

@@ -0,0 +1,15 @@
+package bfcodegen
+
+import (
+	"testing"
+)
+
+func TestApplyEnvOverridesSimple(t *testing.T) {
+
+	err := GenerateEnumSpecs("/home/mike/Code/reiff/badennet/bnet-backend/models", "/home/mike/Code/reiff/badennet/bnet-backend/models/enums_gen.go")
+	if err != nil {
+		t.Error(err)
+		t.Fail()
+	}
+
+}

cursortoken/filter.go

@@ -6,5 +6,5 @@ import (
 
 type Filter interface {
 	FilterQuery() mongo.Pipeline
-	Pagination() (string, SortDirection, *string, *SortDirection)
+	Pagination() (string, SortDirection, string, SortDirection)
 }

goextVersion.go

@@ -0,0 +1,5 @@
+package goext
+
+const GoextVersion = "0.0.145"
+
+const GoextVersionTimestamp = "2023-06-07T12:45:48+0200"

wmo/collection.go

@@ -2,9 +2,7 @@ package wmo
 
 import (
 	"context"
-	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
 	ct "gogs.mikescher.com/BlackForestBytes/goext/cursortoken"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"reflect"
@@ -42,184 +40,6 @@ func (c *Coll[TData]) Drop(ctx context.Context) error {
 	return c.coll.Drop(ctx)
 }
 
-func (c *Coll[TData]) FindOne(ctx context.Context, filter bson.M) (TData, error) {
-	var res TData
-
-	err := c.coll.FindOne(ctx, filter).Decode(&res)
-	if err != nil {
-		return *new(TData), err
-	}
-
-	return res, nil
-}
-
-func (c *Coll[TData]) FindOneOpt(ctx context.Context, filter bson.M) (*TData, error) {
-	var res TData
-
-	err := c.coll.FindOne(ctx, filter).Decode(&res)
-	if err == mongo.ErrNoDocuments {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	return &res, nil
-}
-
-func (c *Coll[TData]) FindOneByID(ctx context.Context, id EntityID) (TData, error) {
-	var res TData
-
-	err := c.coll.FindOne(ctx, bson.M{"_id": id}).Decode(&res)
-	if err != nil {
-		return *new(TData), err
-	}
-
-	return res, nil
-}
-
-func (c *Coll[TData]) FindOneOptByID(ctx context.Context, id EntityID) (*TData, error) {
-	var res TData
-
-	err := c.coll.FindOne(ctx, bson.M{"_id": id}).Decode(&res)
-	if err == mongo.ErrNoDocuments {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	return &res, nil
-}
-
-func (c *Coll[TData]) FindOneAndUpdate(ctx context.Context, filterQuery bson.M, updateQuery bson.M) (TData, error) {
-	var res TData
-
-	err := c.coll.FindOneAndUpdate(ctx, filterQuery, updateQuery, options.FindOneAndUpdate().SetReturnDocument(options.After)).Decode(&res)
-	if err != nil {
-		return *new(TData), err
-	}
-
-	return res, nil
-}
-
-func (c *Coll[TData]) Find(ctx context.Context, filter bson.M, opts ...*options.FindOptions) ([]TData, error) {
-	cursor, err := c.coll.Find(ctx, filter, opts...)
-	if err != nil {
-		return nil, err
-	}
-
-	res := make([]TData, 0, cursor.RemainingBatchLength())
-	err = cursor.All(ctx, &res)
-	if err != nil {
-		return nil, err
-	}
-
-	return res, nil
-}
-
-func (c *Coll[TData]) Aggregate(ctx context.Context, pipeline mongo.Pipeline, opts ...*options.AggregateOptions) ([]TData, error) {
-	cursor, err := c.coll.Aggregate(ctx, pipeline, opts...)
-	if err != nil {
-		return nil, err
-	}
-
-	res := make([]TData, 0, cursor.RemainingBatchLength())
-	err = cursor.All(ctx, &res)
-	if err != nil {
-		return nil, err
-	}
-
-	return res, nil
-}
-
-func (c *Coll[TData]) ReplaceOne(ctx context.Context, id EntityID, value TData) error {
-	_, err := c.coll.UpdateOne(ctx, bson.M{"_id": id}, value)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Coll[TData]) UpdateOne(ctx context.Context, filterQuery bson.M, updateQuery bson.M) error {
-	_, err := c.coll.UpdateOne(ctx, filterQuery, updateQuery)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Coll[TData]) UpdateOneByID(ctx context.Context, id EntityID, updateQuery bson.M) error {
-	_, err := c.coll.UpdateOne(ctx, bson.M{"_id": id}, updateQuery)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Coll[TData]) DeleteOne(ctx context.Context, id EntityID) error {
-	_, err := c.coll.DeleteOne(ctx, bson.M{"_id": id})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Coll[TData]) DeleteMany(ctx context.Context, filterQuery bson.M) (*mongo.DeleteResult, error) {
-	res, err := c.coll.DeleteMany(ctx, filterQuery)
-	if err != nil {
-		return nil, err
-	}
-
-	return res, nil
-}
-
-func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int, inTok ct.CursorToken) ([]TData, ct.CursorToken, error) {
-	if inTok.Mode == ct.CTMEnd {
-		return make([]TData, 0), ct.End(), nil
-	}
-
-	pipeline := filter.FilterQuery()
-
-	sortPrimary, sortDirPrimary, sortSecondary, sortDirSecondary := filter.Pagination()
-
-	paginationPipeline, err := CreatePagination(c, inTok, sortPrimary, sortDirPrimary, sortSecondary, sortDirSecondary, pageSize)
-	if err != nil {
-		return nil, ct.CursorToken{}, err
-	}
-
-	pipeline = append(pipeline, paginationPipeline...)
-
-	cursor, err := c.coll.Aggregate(ctx, pipeline)
-	if err != nil {
-		return nil, ct.CursorToken{}, err
-	}
-
-	entities := make([]TData, 0, cursor.RemainingBatchLength()+1)
-	for (pageSize == nil || len(entities) != *pageSize) && cursor.Next(ctx) {
-		var entry TData
-		err = cursor.Decode(&entry)
-		if err != nil {
-			return nil, ct.CursorToken{}, err
-		}
-		entities = append(entities, entry)
-	}
-
-	if pageSize == nil || len(entities) <= *pageSize || !cursor.TryNext(ctx) {
-		return entities, ct.End(), nil
-	}
-
-	last := entities[len(entities)-1]
-
-	nextToken, _ := c.createToken(sortPrimary, sortDirPrimary, sortSecondary, sortDirSecondary, last, pageSize)
-
-	return entities, nextToken, nil
-}
-
 func (c *Coll[TData]) createToken(fieldPrimary string, dirPrimary ct.SortDirection, fieldSecondary *string, dirSecondary *ct.SortDirection, lastEntity TData, pageSize *int) (ct.CursorToken, error) {
 
 	valuePrimary, err := c.getFieldValueAsTokenString(lastEntity, fieldPrimary)

wmo/queryAggregate.go

@@ -0,0 +1,22 @@
+package wmo
+
+import (
+	"context"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+func (c *Coll[TData]) Aggregate(ctx context.Context, pipeline mongo.Pipeline, opts ...*options.AggregateOptions) ([]TData, error) {
+	cursor, err := c.coll.Aggregate(ctx, pipeline, opts...)
+	if err != nil {
+		return nil, err
+	}
+
+	res := make([]TData, 0, cursor.RemainingBatchLength())
+	err = cursor.All(ctx, &res)
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}

wmo/queryDelete.go

@@ -0,0 +1,25 @@
+package wmo
+
+import (
+	"context"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+)
+
+func (c *Coll[TData]) DeleteOne(ctx context.Context, id EntityID) error {
+	_, err := c.coll.DeleteOne(ctx, bson.M{"_id": id})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (c *Coll[TData]) DeleteMany(ctx context.Context, filterQuery bson.M) (*mongo.DeleteResult, error) {
+	res, err := c.coll.DeleteMany(ctx, filterQuery)
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}

wmo/queryFind.go

@@ -0,0 +1,73 @@
+package wmo
+
+import (
+	"context"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+func (c *Coll[TData]) FindOne(ctx context.Context, filter bson.M) (TData, error) {
+	var res TData
+
+	err := c.coll.FindOne(ctx, filter).Decode(&res)
+	if err != nil {
+		return *new(TData), err
+	}
+
+	return res, nil
+}
+
+func (c *Coll[TData]) FindOneOpt(ctx context.Context, filter bson.M) (*TData, error) {
+	var res TData
+
+	err := c.coll.FindOne(ctx, filter).Decode(&res)
+	if err == mongo.ErrNoDocuments {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return &res, nil
+}
+
+func (c *Coll[TData]) FindOneByID(ctx context.Context, id EntityID) (TData, error) {
+	var res TData
+
+	err := c.coll.FindOne(ctx, bson.M{"_id": id}).Decode(&res)
+	if err != nil {
+		return *new(TData), err
+	}
+
+	return res, nil
+}
+
+func (c *Coll[TData]) FindOneOptByID(ctx context.Context, id EntityID) (*TData, error) {
+	var res TData
+
+	err := c.coll.FindOne(ctx, bson.M{"_id": id}).Decode(&res)
+	if err == mongo.ErrNoDocuments {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return &res, nil
+}
+
+func (c *Coll[TData]) Find(ctx context.Context, filter bson.M, opts ...*options.FindOptions) ([]TData, error) {
+	cursor, err := c.coll.Find(ctx, filter, opts...)
+	if err != nil {
+		return nil, err
+	}
+
+	res := make([]TData, 0, cursor.RemainingBatchLength())
+	err = cursor.All(ctx, &res)
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}

wmo/queryInsert.go

@@ -0,0 +1,22 @@
+package wmo
+
+import (
+	"context"
+	"go.mongodb.org/mongo-driver/bson"
+)
+
+func (c *Coll[TData]) InsertOne(ctx context.Context, valueIn TData) (TData, error) {
+	insRes, err := c.coll.InsertOne(ctx, valueIn)
+	if err != nil {
+		return *new(TData), err
+	}
+
+	var res TData
+
+	err = c.coll.FindOne(ctx, bson.M{"_id": insRes.InsertedID}).Decode(&res)
+	if err != nil {
+		return *new(TData), err
+	}
+
+	return res, nil
+}

wmo/queryList.go

@@ -0,0 +1,85 @@
+package wmo
+
+import (
+	"context"
+	"go.mongodb.org/mongo-driver/bson"
+	ct "gogs.mikescher.com/BlackForestBytes/goext/cursortoken"
+)
+
+func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int, inTok ct.CursorToken) ([]TData, ct.CursorToken, error) {
+	if inTok.Mode == ct.CTMEnd {
+		return make([]TData, 0), ct.End(), nil
+	}
+
+	pipeline := filter.FilterQuery()
+
+	pf1, pd1, pf2, pd2 := filter.Pagination()
+
+	sortPrimary := pf1
+	sortDirPrimary := pd1
+	sortSecondary := &pf2
+	sortDirSecondary := &pd2
+
+	if pf1 == pf2 {
+		sortSecondary = nil
+		sortDirSecondary = nil
+	}
+
+	paginationPipeline, err := CreatePagination(c, inTok, sortPrimary, sortDirPrimary, sortSecondary, sortDirSecondary, pageSize)
+	if err != nil {
+		return nil, ct.CursorToken{}, err
+	}
+
+	pipeline = append(pipeline, paginationPipeline...)
+
+	cursor, err := c.coll.Aggregate(ctx, pipeline)
+	if err != nil {
+		return nil, ct.CursorToken{}, err
+	}
+
+	entities := make([]TData, 0, cursor.RemainingBatchLength()+1)
+	for (pageSize == nil || len(entities) != *pageSize) && cursor.Next(ctx) {
+		var entry TData
+		err = cursor.Decode(&entry)
+		if err != nil {
+			return nil, ct.CursorToken{}, err
+		}
+		entities = append(entities, entry)
+	}
+
+	if pageSize == nil || len(entities) <= *pageSize || !cursor.TryNext(ctx) {
+		return entities, ct.End(), nil
+	}
+
+	last := entities[len(entities)-1]
+
+	nextToken, _ := c.createToken(sortPrimary, sortDirPrimary, sortSecondary, sortDirSecondary, last, pageSize)
+
+	return entities, nextToken, nil
+}
+
+type countRes struct {
+	Count int64 `bson:"c"`
+}
+
+func (c *Coll[TData]) Count(ctx context.Context, filter ct.Filter) (int64, error) {
+	pipeline := filter.FilterQuery()
+
+	pipeline = append(pipeline, bson.D{{Key: "$count", Value: "c"}})
+
+	cursor, err := c.coll.Aggregate(ctx, pipeline)
+	if err != nil {
+		return 0, err
+	}
+
+	if cursor.Next(ctx) {
+		v := countRes{}
+		err = cursor.Decode(&v)
+		if err != nil {
+			return 0, err
+		}
+		return v.Count, nil
+	}
+
+	return 0, nil
+}

wmo/queryUpdate.go

@@ -0,0 +1,66 @@
+package wmo
+
+import (
+	"context"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+func (c *Coll[TData]) FindOneAndUpdate(ctx context.Context, filterQuery bson.M, updateQuery bson.M) (TData, error) {
+	var res TData
+
+	err := c.coll.FindOneAndUpdate(ctx, filterQuery, updateQuery, options.FindOneAndUpdate().SetReturnDocument(options.After)).Decode(&res)
+	if err != nil {
+		return *new(TData), err
+	}
+
+	return res, nil
+}
+
+func (c *Coll[TData]) UpdateOne(ctx context.Context, filterQuery bson.M, updateQuery bson.M) error {
+	_, err := c.coll.UpdateOne(ctx, filterQuery, updateQuery)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (c *Coll[TData]) UpdateOneByID(ctx context.Context, id EntityID, updateQuery bson.M) error {
+	_, err := c.coll.UpdateOne(ctx, bson.M{"_id": id}, updateQuery)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (c *Coll[TData]) UpdateMany(ctx context.Context, filterQuery bson.M, updateQuery bson.M) (*mongo.UpdateResult, error) {
+	res, err := c.coll.UpdateMany(ctx, filterQuery, updateQuery)
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
+func (c *Coll[TData]) ReplaceOne(ctx context.Context, id EntityID, value TData) error {
+	_, err := c.coll.UpdateOne(ctx, bson.M{"_id": id}, value)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (c *Coll[TData]) FindOneAndReplace(ctx context.Context, id EntityID, value TData) (TData, error) {
+	var res TData
+
+	err := c.coll.FindOneAndUpdate(ctx, bson.M{"_id": id}, value, options.FindOneAndUpdate().SetReturnDocument(options.After)).Decode(&res)
+	if err != nil {
+		return *new(TData), err
+	}
+
+	return res, nil
+}