Compare commits
	
		
			21 Commits
		
	
	
		
			v0.0.241
			...
			29a3f73f15
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 29a3f73f15 | |||
| 98105642fc | |||
| 0fd5f3b417 | |||
| 43cac4b3bb | |||
| cd68af8e66 | |||
| 113d838876 | |||
| 9e5bc0d3ea | |||
| 6d3bd13f61 | |||
| b5ca475b3f | |||
| a75b1291cb | |||
| 21cd1ee066 | |||
| ae43cbb623 | |||
| 9b752a911c | |||
| ec9ac26a4c | |||
| 39a0b73d56 | |||
| 2e2e15d4d2 | |||
| 0d16946aba | |||
| 14441c2378 | |||
| f6bcdc9903 | |||
| a95053211c | |||
| 813ce71e3e | 
							
								
								
									
										9
									
								
								.gitea/workflows/Dockerfile_tests
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								.gitea/workflows/Dockerfile_tests
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| FROM golang:latest | ||||
|  | ||||
| RUN apt install -y make curl python3 && go install gotest.tools/gotestsum@latest | ||||
|  | ||||
| COPY . /source | ||||
|  | ||||
| WORKDIR /source | ||||
|  | ||||
| CMD ["make", "test"] | ||||
							
								
								
									
										30
									
								
								.gitea/workflows/tests.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								.gitea/workflows/tests.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,30 @@ | ||||
|  | ||||
| # https://docs.gitea.com/next/usage/actions/quickstart | ||||
| # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions | ||||
| # https://docs.github.com/en/actions/learn-github-actions/contexts#github-context | ||||
|  | ||||
| name: Build Docker and Deploy | ||||
| run-name: Build & Deploy ${{ gitea.ref }} on ${{ gitea.actor }} | ||||
|  | ||||
| on: [push] | ||||
|  | ||||
| jobs: | ||||
|   run_tests: | ||||
|     name: Run goext test-suite | ||||
|     runs-on: bfb-cicd-latest | ||||
|     steps: | ||||
|  | ||||
|       - name: Check out code | ||||
|         uses: actions/checkout@v3 | ||||
|  | ||||
|       - name: Build test docker | ||||
|         id: build_docker | ||||
|         run: echo "DOCKER_IMG_ID=$(docker build -q . -f .gitea/workflows/Dockerfile_tests || echo __err_build__)" >> $GITHUB_OUTPUT | ||||
|  | ||||
|       - name: Run tests | ||||
|         run: docker run --rm "${{ steps.build_docker.outputs.DOCKER_IMG_ID }}" | ||||
|  | ||||
|       - name: Cleanup | ||||
|         if: always() | ||||
|         run: docker image rm "${{ steps.build_docker.outputs.DOCKER_IMG_ID }}" | ||||
|  | ||||
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							| @@ -5,7 +5,7 @@ run: | ||||
| test: | ||||
| 	# go test ./... | ||||
| 	which gotestsum || go install gotest.tools/gotestsum@latest | ||||
| 	gotestsum --format "testname" -- -tags="timetzdata sqlite_fts5 sqlite_foreign_keys" "./test" | ||||
| 	gotestsum --format "testname" -- -tags="timetzdata sqlite_fts5 sqlite_foreign_keys" "./..." | ||||
|  | ||||
| version: | ||||
| 	_data/version.sh | ||||
							
								
								
									
										
											BIN
										
									
								
								bfcodegen/_test_example.tgz
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								bfcodegen/_test_example.tgz
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| @@ -1,15 +1,42 @@ | ||||
| package bfcodegen | ||||
|  | ||||
| import ( | ||||
| 	_ "embed" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/cmdext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
| 	"testing" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| func TestApplyEnvOverridesSimple(t *testing.T) { | ||||
| //go:embed _test_example.tgz | ||||
| var ExampleModels []byte | ||||
|  | ||||
| 	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() | ||||
| 	} | ||||
| func TestGenerateEnumSpecs(t *testing.T) { | ||||
|  | ||||
| 	tmpFile := filepath.Join(t.TempDir(), langext.MustHexUUID()+".tgz") | ||||
|  | ||||
| 	tmpDir := filepath.Join(t.TempDir(), langext.MustHexUUID()) | ||||
|  | ||||
| 	err := os.WriteFile(tmpFile, ExampleModels, 0o777) | ||||
| 	tst.AssertNoErr(t, err) | ||||
|  | ||||
| 	t.Cleanup(func() { _ = os.Remove(tmpFile) }) | ||||
|  | ||||
| 	err = os.Mkdir(tmpDir, 0o777) | ||||
| 	tst.AssertNoErr(t, err) | ||||
|  | ||||
| 	t.Cleanup(func() { _ = os.RemoveAll(tmpFile) }) | ||||
|  | ||||
| 	_, err = cmdext.Runner("tar").Arg("-xvzf").Arg(tmpFile).Arg("-C").Arg(tmpDir).FailOnExitCode().FailOnTimeout().Timeout(time.Minute).Run() | ||||
| 	tst.AssertNoErr(t, err) | ||||
|  | ||||
| 	err = GenerateEnumSpecs(tmpDir, tmpDir+"/enums_gen.go") | ||||
| 	tst.AssertNoErr(t, err) | ||||
|  | ||||
| 	err = GenerateEnumSpecs(tmpDir, tmpDir+"/enums_gen.go") | ||||
| 	tst.AssertNoErr(t, err) | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -33,7 +33,7 @@ func TestStdout(t *testing.T) { | ||||
|  | ||||
| func TestStderr(t *testing.T) { | ||||
|  | ||||
| 	res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"error\", file=sys.stderr, end='')").Run() | ||||
| 	res1, err := Runner("python3").Arg("-c").Arg("import sys; print(\"error\", file=sys.stderr, end='')").Run() | ||||
| 	if err != nil { | ||||
| 		t.Errorf("%v", err) | ||||
| 	} | ||||
| @@ -56,7 +56,7 @@ func TestStderr(t *testing.T) { | ||||
| } | ||||
|  | ||||
| func TestStdcombined(t *testing.T) { | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		Arg("-c"). | ||||
| 		Arg("import sys; import time; print(\"1\", file=sys.stderr, flush=True); time.sleep(0.1); print(\"2\", file=sys.stdout, flush=True); time.sleep(0.1); print(\"3\", file=sys.stderr, flush=True)"). | ||||
| 		Run() | ||||
| @@ -82,7 +82,7 @@ func TestStdcombined(t *testing.T) { | ||||
| } | ||||
|  | ||||
| func TestPartialRead(t *testing.T) { | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		Arg("-c"). | ||||
| 		Arg("import sys; import time; print(\"first message\", flush=True); time.sleep(5); print(\"cant see me\", flush=True);"). | ||||
| 		Timeout(100 * time.Millisecond). | ||||
| @@ -106,7 +106,7 @@ func TestPartialRead(t *testing.T) { | ||||
| } | ||||
|  | ||||
| func TestPartialReadStderr(t *testing.T) { | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		Arg("-c"). | ||||
| 		Arg("import sys; import time; print(\"first message\", file=sys.stderr, flush=True); time.sleep(5); print(\"cant see me\", file=sys.stderr, flush=True);"). | ||||
| 		Timeout(100 * time.Millisecond). | ||||
| @@ -131,7 +131,7 @@ func TestPartialReadStderr(t *testing.T) { | ||||
|  | ||||
| func TestReadUnflushedStdout(t *testing.T) { | ||||
|  | ||||
| 	res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stdout, end='')").Run() | ||||
| 	res1, err := Runner("python3").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stdout, end='')").Run() | ||||
| 	if err != nil { | ||||
| 		t.Errorf("%v", err) | ||||
| 	} | ||||
| @@ -155,7 +155,7 @@ func TestReadUnflushedStdout(t *testing.T) { | ||||
|  | ||||
| func TestReadUnflushedStderr(t *testing.T) { | ||||
|  | ||||
| 	res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stderr, end='')").Run() | ||||
| 	res1, err := Runner("python3").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stderr, end='')").Run() | ||||
| 	if err != nil { | ||||
| 		t.Errorf("%v", err) | ||||
| 	} | ||||
| @@ -180,7 +180,7 @@ func TestReadUnflushedStderr(t *testing.T) { | ||||
| func TestPartialReadUnflushed(t *testing.T) { | ||||
| 	t.SkipNow() | ||||
|  | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		Arg("-c"). | ||||
| 		Arg("import sys; import time; print(\"first message\", end=''); time.sleep(5); print(\"cant see me\", end='');"). | ||||
| 		Timeout(100 * time.Millisecond). | ||||
| @@ -206,7 +206,7 @@ func TestPartialReadUnflushed(t *testing.T) { | ||||
| func TestPartialReadUnflushedStderr(t *testing.T) { | ||||
| 	t.SkipNow() | ||||
|  | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		Arg("-c"). | ||||
| 		Arg("import sys; import time; print(\"first message\", file=sys.stderr, end=''); time.sleep(5); print(\"cant see me\", file=sys.stderr, end='');"). | ||||
| 		Timeout(100 * time.Millisecond). | ||||
| @@ -231,7 +231,7 @@ func TestPartialReadUnflushedStderr(t *testing.T) { | ||||
|  | ||||
| func TestListener(t *testing.T) { | ||||
|  | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		Arg("-c"). | ||||
| 		Arg("import sys;" + | ||||
| 			"import time;" + | ||||
| @@ -264,7 +264,7 @@ func TestListener(t *testing.T) { | ||||
|  | ||||
| func TestLongStdout(t *testing.T) { | ||||
|  | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		Arg("-c"). | ||||
| 		Arg("import sys; import time; print(\"X\" * 125001 + \"\\n\"); print(\"Y\" * 125001 + \"\\n\"); print(\"Z\" * 125001 + \"\\n\");"). | ||||
| 		Timeout(5000 * time.Millisecond). | ||||
| @@ -298,7 +298,7 @@ func TestFailOnTimeout(t *testing.T) { | ||||
|  | ||||
| func TestFailOnStderr(t *testing.T) { | ||||
|  | ||||
| 	res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"error\", file=sys.stderr, end='')").FailOnStderr().Run() | ||||
| 	res1, err := Runner("python3").Arg("-c").Arg("import sys; print(\"error\", file=sys.stderr, end='')").FailOnStderr().Run() | ||||
| 	if err == nil { | ||||
| 		t.Errorf("no err") | ||||
| 	} | ||||
|   | ||||
							
								
								
									
										170
									
								
								dataext/tuple.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										170
									
								
								dataext/tuple.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,170 @@ | ||||
| package dataext | ||||
|  | ||||
| type ValueGroup interface { | ||||
| 	TupleLength() int | ||||
| 	TupleValues() []any | ||||
| } | ||||
|  | ||||
| // ---------------------------------------------------------------------------- | ||||
|  | ||||
| type Single[T1 any] struct { | ||||
| 	V1 T1 | ||||
| } | ||||
|  | ||||
| func (s Single[T1]) TupleLength() int { | ||||
| 	return 1 | ||||
| } | ||||
|  | ||||
| func (s Single[T1]) TupleValues() []any { | ||||
| 	return []any{s.V1} | ||||
| } | ||||
|  | ||||
| // ---------------------------------------------------------------------------- | ||||
|  | ||||
| type Tuple[T1 any, T2 any] struct { | ||||
| 	V1 T1 | ||||
| 	V2 T2 | ||||
| } | ||||
|  | ||||
| func (t Tuple[T1, T2]) TupleLength() int { | ||||
| 	return 2 | ||||
| } | ||||
|  | ||||
| func (t Tuple[T1, T2]) TupleValues() []any { | ||||
| 	return []any{t.V1, t.V2} | ||||
| } | ||||
|  | ||||
| // ---------------------------------------------------------------------------- | ||||
|  | ||||
| type Triple[T1 any, T2 any, T3 any] struct { | ||||
| 	V1 T1 | ||||
| 	V2 T2 | ||||
| 	V3 T3 | ||||
| } | ||||
|  | ||||
| func (t Triple[T1, T2, T3]) TupleLength() int { | ||||
| 	return 3 | ||||
| } | ||||
|  | ||||
| func (t Triple[T1, T2, T3]) TupleValues() []any { | ||||
| 	return []any{t.V1, t.V2, t.V3} | ||||
| } | ||||
|  | ||||
| // ---------------------------------------------------------------------------- | ||||
|  | ||||
| type Quadruple[T1 any, T2 any, T3 any, T4 any] struct { | ||||
| 	V1 T1 | ||||
| 	V2 T2 | ||||
| 	V3 T3 | ||||
| 	V4 T4 | ||||
| } | ||||
|  | ||||
| func (t Quadruple[T1, T2, T3, T4]) TupleLength() int { | ||||
| 	return 4 | ||||
| } | ||||
|  | ||||
| func (t Quadruple[T1, T2, T3, T4]) TupleValues() []any { | ||||
| 	return []any{t.V1, t.V2, t.V3, t.V4} | ||||
| } | ||||
|  | ||||
| // ---------------------------------------------------------------------------- | ||||
|  | ||||
| type Quintuple[T1 any, T2 any, T3 any, T4 any, T5 any] struct { | ||||
| 	V1 T1 | ||||
| 	V2 T2 | ||||
| 	V3 T3 | ||||
| 	V4 T4 | ||||
| 	V5 T5 | ||||
| } | ||||
|  | ||||
| func (t Quintuple[T1, T2, T3, T4, T5]) TupleLength() int { | ||||
| 	return 5 | ||||
| } | ||||
|  | ||||
| func (t Quintuple[T1, T2, T3, T4, T5]) TupleValues() []any { | ||||
| 	return []any{t.V1, t.V2, t.V3, t.V4, t.V5} | ||||
|  | ||||
| } | ||||
|  | ||||
| // ---------------------------------------------------------------------------- | ||||
|  | ||||
| type Sextuple[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any] struct { | ||||
| 	V1 T1 | ||||
| 	V2 T2 | ||||
| 	V3 T3 | ||||
| 	V4 T4 | ||||
| 	V5 T5 | ||||
| 	V6 T6 | ||||
| } | ||||
|  | ||||
| func (t Sextuple[T1, T2, T3, T4, T5, T6]) TupleLength() int { | ||||
| 	return 6 | ||||
| } | ||||
|  | ||||
| func (t Sextuple[T1, T2, T3, T4, T5, T6]) TupleValues() []any { | ||||
| 	return []any{t.V1, t.V2, t.V3, t.V4, t.V5, t.V6} | ||||
|  | ||||
| } | ||||
|  | ||||
| // ---------------------------------------------------------------------------- | ||||
|  | ||||
| type Septuple[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any, T7 any] struct { | ||||
| 	V1 T1 | ||||
| 	V2 T2 | ||||
| 	V3 T3 | ||||
| 	V4 T4 | ||||
| 	V5 T5 | ||||
| 	V6 T6 | ||||
| 	V7 T7 | ||||
| } | ||||
|  | ||||
| func (t Septuple[T1, T2, T3, T4, T5, T6, T7]) TupleLength() int { | ||||
| 	return 7 | ||||
| } | ||||
|  | ||||
| func (t Septuple[T1, T2, T3, T4, T5, T6, T7]) TupleValues() []any { | ||||
| 	return []any{t.V1, t.V2, t.V3, t.V4, t.V5, t.V6, t.V7} | ||||
| } | ||||
|  | ||||
| // ---------------------------------------------------------------------------- | ||||
|  | ||||
| type Octuple[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any, T7 any, T8 any] struct { | ||||
| 	V1 T1 | ||||
| 	V2 T2 | ||||
| 	V3 T3 | ||||
| 	V4 T4 | ||||
| 	V5 T5 | ||||
| 	V6 T6 | ||||
| 	V7 T7 | ||||
| 	V8 T8 | ||||
| } | ||||
|  | ||||
| func (t Octuple[T1, T2, T3, T4, T5, T6, T7, T8]) TupleLength() int { | ||||
| 	return 8 | ||||
| } | ||||
|  | ||||
| func (t Octuple[T1, T2, T3, T4, T5, T6, T7, T8]) TupleValues() []any { | ||||
| 	return []any{t.V1, t.V2, t.V3, t.V4, t.V5, t.V6, t.V7, t.V8} | ||||
| } | ||||
|  | ||||
| // ---------------------------------------------------------------------------- | ||||
|  | ||||
| type Nonuple[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any, T7 any, T8 any, T9 any] struct { | ||||
| 	V1 T1 | ||||
| 	V2 T2 | ||||
| 	V3 T3 | ||||
| 	V4 T4 | ||||
| 	V5 T5 | ||||
| 	V6 T6 | ||||
| 	V7 T7 | ||||
| 	V8 T8 | ||||
| 	V9 T9 | ||||
| } | ||||
|  | ||||
| func (t Nonuple[T1, T2, T3, T4, T5, T6, T7, T8, T9]) TupleLength() int { | ||||
| 	return 9 | ||||
| } | ||||
|  | ||||
| func (t Nonuple[T1, T2, T3, T4, T5, T6, T7, T8, T9]) TupleValues() []any { | ||||
| 	return []any{t.V1, t.V2, t.V3, t.V4, t.V5, t.V6, t.V7, t.V8, t.V9} | ||||
| } | ||||
| @@ -42,6 +42,11 @@ var ( | ||||
| 	TypePanic          = NewType("PANIC", langext.Ptr(500)) | ||||
| 	TypeNotImplemented = NewType("NOT_IMPLEMENTED", langext.Ptr(500)) | ||||
|  | ||||
| 	TypeMongoQuery        = NewType("MONGO_QUERY", langext.Ptr(500)) | ||||
| 	TypeCursorTokenDecode = NewType("CURSOR_TOKEN_DECODE", langext.Ptr(500)) | ||||
| 	TypeMongoFilter       = NewType("MONGO_FILTER", langext.Ptr(500)) | ||||
| 	TypeMongoReflection   = NewType("MONGO_REFLECTION", langext.Ptr(500)) | ||||
|  | ||||
| 	TypeWrap = NewType("Wrap", nil) | ||||
|  | ||||
| 	TypeBindFailURI      = NewType("BINDFAIL_URI", langext.Ptr(400)) | ||||
| @@ -53,7 +58,7 @@ var ( | ||||
| 	TypeUnauthorized = NewType("UNAUTHORIZED", langext.Ptr(401)) | ||||
| 	TypeAuthFailed   = NewType("AUTH_FAILED", langext.Ptr(401)) | ||||
|  | ||||
| 	// other values come from pkgconfig | ||||
| 	// other values come the used package | ||||
| ) | ||||
|  | ||||
| var registeredTypes = dataext.SyncSet[string]{} | ||||
|   | ||||
| @@ -16,11 +16,11 @@ type ErrorPackageConfig struct { | ||||
| } | ||||
|  | ||||
| type ErrorPackageConfigInit struct { | ||||
| 	ZeroLogErrTraces       bool | ||||
| 	ZeroLogAllTraces       bool | ||||
| 	RecursiveErrors        bool | ||||
| 	ExtendedGinOutput      bool | ||||
| 	IncludeMetaInGinOutput bool | ||||
| 	ZeroLogErrTraces       *bool | ||||
| 	ZeroLogAllTraces       *bool | ||||
| 	RecursiveErrors        *bool | ||||
| 	ExtendedGinOutput      *bool | ||||
| 	IncludeMetaInGinOutput *bool | ||||
| 	ExtendGinOutput        func(err *ExErr, json map[string]any) | ||||
| 	ExtendGinDataOutput    func(err *ExErr, depth int, json map[string]any) | ||||
| } | ||||
| @@ -56,11 +56,11 @@ func Init(cfg ErrorPackageConfigInit) { | ||||
| 	} | ||||
|  | ||||
| 	pkgconfig = ErrorPackageConfig{ | ||||
| 		ZeroLogErrTraces:       cfg.ZeroLogErrTraces, | ||||
| 		ZeroLogAllTraces:       cfg.ZeroLogAllTraces, | ||||
| 		RecursiveErrors:        cfg.RecursiveErrors, | ||||
| 		ExtendedGinOutput:      cfg.ExtendedGinOutput, | ||||
| 		IncludeMetaInGinOutput: cfg.IncludeMetaInGinOutput, | ||||
| 		ZeroLogErrTraces:       langext.Coalesce(cfg.ZeroLogErrTraces, pkgconfig.ZeroLogErrTraces), | ||||
| 		ZeroLogAllTraces:       langext.Coalesce(cfg.ZeroLogAllTraces, pkgconfig.ZeroLogAllTraces), | ||||
| 		RecursiveErrors:        langext.Coalesce(cfg.RecursiveErrors, pkgconfig.RecursiveErrors), | ||||
| 		ExtendedGinOutput:      langext.Coalesce(cfg.ExtendedGinOutput, pkgconfig.ExtendedGinOutput), | ||||
| 		IncludeMetaInGinOutput: langext.Coalesce(cfg.IncludeMetaInGinOutput, pkgconfig.IncludeMetaInGinOutput), | ||||
| 		ExtendGinOutput:        ego, | ||||
| 		ExtendGinDataOutput:    egdo, | ||||
| 	} | ||||
|   | ||||
| @@ -612,7 +612,18 @@ func (v MetaValue) rawValueForJson() any { | ||||
| 		if v.Value.(AnyWrap).IsNil { | ||||
| 			return nil | ||||
| 		} | ||||
| 		return v.Value.(AnyWrap).Serialize() | ||||
| 		if v.Value.(AnyWrap).IsError { | ||||
| 			return bson.M{"@error": true} | ||||
| 		} | ||||
| 		jsonobj := primitive.M{} | ||||
| 		jsonarr := primitive.A{} | ||||
| 		if err := json.Unmarshal([]byte(v.Value.(AnyWrap).Json), &jsonobj); err == nil { | ||||
| 			return jsonobj | ||||
| 		} else if err := json.Unmarshal([]byte(v.Value.(AnyWrap).Json), &jsonarr); err == nil { | ||||
| 			return jsonarr | ||||
| 		} else { | ||||
| 			return bson.M{"type": v.Value.(AnyWrap).Type, "data": v.Value.(AnyWrap).Json} | ||||
| 		} | ||||
| 	} | ||||
| 	if v.DataType == MDTID { | ||||
| 		if v.Value.(IDWrap).IsNil { | ||||
|   | ||||
| @@ -116,7 +116,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) { | ||||
| 	} | ||||
|  | ||||
| 	if pctx.header != nil { | ||||
| 		if err := pctx.ginCtx.ShouldBindHeader(pctx.query); err != nil { | ||||
| 		if err := pctx.ginCtx.ShouldBindHeader(pctx.header); err != nil { | ||||
| 			err = exerr.Wrap(err, "Failed to read header"). | ||||
| 				WithType(exerr.TypeBindFailHeader). | ||||
| 				Str("struct_type", fmt.Sprintf("%T", pctx.query)). | ||||
|   | ||||
							
								
								
									
										16
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								go.mod
									
									
									
									
									
								
							| @@ -8,9 +8,9 @@ require ( | ||||
| 	github.com/rs/xid v1.5.0 | ||||
| 	github.com/rs/zerolog v1.30.0 | ||||
| 	go.mongodb.org/mongo-driver v1.12.1 | ||||
| 	golang.org/x/crypto v0.12.0 | ||||
| 	golang.org/x/sys v0.11.0 | ||||
| 	golang.org/x/term v0.11.0 | ||||
| 	golang.org/x/crypto v0.13.0 | ||||
| 	golang.org/x/sys v0.12.0 | ||||
| 	golang.org/x/term v0.12.0 | ||||
| ) | ||||
|  | ||||
| require ( | ||||
| @@ -21,7 +21,7 @@ require ( | ||||
| 	github.com/gin-contrib/sse v0.1.0 // indirect | ||||
| 	github.com/go-playground/locales v0.14.1 // indirect | ||||
| 	github.com/go-playground/universal-translator v0.18.1 // indirect | ||||
| 	github.com/go-playground/validator/v10 v10.15.0 // indirect | ||||
| 	github.com/go-playground/validator/v10 v10.15.3 // indirect | ||||
| 	github.com/goccy/go-json v0.10.2 // indirect | ||||
| 	github.com/golang/snappy v0.0.4 // indirect | ||||
| 	github.com/json-iterator/go v1.1.12 // indirect | ||||
| @@ -33,7 +33,7 @@ require ( | ||||
| 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||||
| 	github.com/modern-go/reflect2 v1.0.2 // indirect | ||||
| 	github.com/montanaflynn/stats v0.7.1 // indirect | ||||
| 	github.com/pelletier/go-toml/v2 v2.0.9 // indirect | ||||
| 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect | ||||
| 	github.com/pkg/errors v0.9.1 // indirect | ||||
| 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect | ||||
| 	github.com/ugorji/go/codec v1.2.11 // indirect | ||||
| @@ -41,10 +41,10 @@ require ( | ||||
| 	github.com/xdg-go/scram v1.1.2 // indirect | ||||
| 	github.com/xdg-go/stringprep v1.0.4 // indirect | ||||
| 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect | ||||
| 	golang.org/x/arch v0.4.0 // indirect | ||||
| 	golang.org/x/net v0.14.0 // indirect | ||||
| 	golang.org/x/arch v0.5.0 // indirect | ||||
| 	golang.org/x/net v0.15.0 // indirect | ||||
| 	golang.org/x/sync v0.3.0 // indirect | ||||
| 	golang.org/x/text v0.12.0 // indirect | ||||
| 	golang.org/x/text v0.13.0 // indirect | ||||
| 	google.golang.org/protobuf v1.31.0 // indirect | ||||
| 	gopkg.in/yaml.v3 v3.0.1 // indirect | ||||
| ) | ||||
|   | ||||
							
								
								
									
										18
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								go.sum
									
									
									
									
									
								
							| @@ -30,6 +30,10 @@ github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+j | ||||
| github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= | ||||
| github.com/go-playground/validator/v10 v10.15.0 h1:nDU5XeOKtB3GEa+uB7GNYwhVKsgjAR7VgKoNB6ryXfw= | ||||
| github.com/go-playground/validator/v10 v10.15.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= | ||||
| github.com/go-playground/validator/v10 v10.15.1 h1:BSe8uhN+xQ4r5guV/ywQI4gO59C2raYcGffYWZEjZzM= | ||||
| github.com/go-playground/validator/v10 v10.15.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= | ||||
| github.com/go-playground/validator/v10 v10.15.3 h1:S+sSpunYjNPDuXkWbK+x+bA7iXiW296KG4dL3X7xUZo= | ||||
| github.com/go-playground/validator/v10 v10.15.3/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= | ||||
| github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= | ||||
| github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= | ||||
| github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= | ||||
| @@ -81,6 +85,8 @@ github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8 | ||||
| github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= | ||||
| github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= | ||||
| github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= | ||||
| github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= | ||||
| github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= | ||||
| github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= | ||||
| github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= | ||||
| github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | ||||
| @@ -133,6 +139,8 @@ go.mongodb.org/mongo-driver v1.12.1/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl | ||||
| golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= | ||||
| golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc= | ||||
| golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= | ||||
| golang.org/x/arch v0.5.0 h1:jpGode6huXQxcskEIpOCvrU+tzo81b6+oFLUYXWtH/Y= | ||||
| golang.org/x/arch v0.5.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= | ||||
| golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | ||||
| golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||||
| golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= | ||||
| @@ -143,6 +151,8 @@ golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= | ||||
| golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= | ||||
| golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= | ||||
| golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= | ||||
| golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= | ||||
| golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= | ||||
| golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= | ||||
| golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | ||||
| golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||
| @@ -155,6 +165,8 @@ golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY= | ||||
| golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= | ||||
| golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= | ||||
| golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= | ||||
| golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= | ||||
| golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= | ||||
| golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||
| golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= | ||||
| golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||
| @@ -182,6 +194,8 @@ golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= | ||||
| golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= | ||||
| golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= | ||||
| golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | ||||
| golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= | ||||
| golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= | ||||
| @@ -192,6 +206,8 @@ golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= | ||||
| golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= | ||||
| golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= | ||||
| golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= | ||||
| golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= | ||||
| golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= | ||||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||||
| golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||
| golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||
| @@ -204,6 +220,8 @@ golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= | ||||
| golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= | ||||
| golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= | ||||
| golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= | ||||
| golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= | ||||
| golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= | ||||
| golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||
| golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= | ||||
| golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| package goext | ||||
|  | ||||
| const GoextVersion = "0.0.241" | ||||
| const GoextVersion = "0.0.258" | ||||
|  | ||||
| const GoextVersionTimestamp = "2023-08-14T15:54:50+0200" | ||||
| const GoextVersionTimestamp = "2023-09-11T11:28:34+0200" | ||||
|   | ||||
| @@ -400,7 +400,7 @@ func ArrCastErr[T1 any, T2 any](arr []T1) ([]T2, error) { | ||||
| 		if vcast, ok := any(v).(T2); ok { | ||||
| 			r[i] = vcast | ||||
| 		} else { | ||||
| 			return nil, errors.New(fmt.Sprintf("Cannot cast element %d of type %T to type %s", i, v, *new(T2))) | ||||
| 			return nil, errors.New(fmt.Sprintf("Cannot cast element %d of type %T to type %v", i, v, *new(T2))) | ||||
| 		} | ||||
| 	} | ||||
| 	return r, nil | ||||
| @@ -412,7 +412,7 @@ func ArrCastPanic[T1 any, T2 any](arr []T1) []T2 { | ||||
| 		if vcast, ok := any(v).(T2); ok { | ||||
| 			r[i] = vcast | ||||
| 		} else { | ||||
| 			panic(fmt.Sprintf("Cannot cast element %d of type %T to type %s", i, v, *new(T2))) | ||||
| 			panic(fmt.Sprintf("Cannot cast element %d of type %T to type %v", i, v, *new(T2))) | ||||
| 		} | ||||
| 	} | ||||
| 	return r | ||||
| @@ -476,4 +476,6 @@ func JoinString(arr []string, delimiter string) string { | ||||
| 			str += delimiter | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	return str | ||||
| } | ||||
|   | ||||
							
								
								
									
										12
									
								
								langext/array_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								langext/array_test.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | ||||
| package langext | ||||
|  | ||||
| import ( | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"testing" | ||||
| ) | ||||
|  | ||||
| func TestJoinString(t *testing.T) { | ||||
| 	ids := []string{"1", "2", "3"} | ||||
| 	res := JoinString(ids, ",") | ||||
| 	tst.AssertEqual(t, res, "1,2,3") | ||||
| } | ||||
| @@ -1,6 +1,7 @@ | ||||
| package langext | ||||
|  | ||||
| import ( | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"testing" | ||||
| ) | ||||
|  | ||||
| @@ -59,9 +60,3 @@ func TestBase58FlickrDecoding(t *testing.T) { | ||||
| 	tst.AssertEqual(t, _decStr(t, Base58FlickrEncoding, "9aJCVZR"), "Hello") | ||||
| 	tst.AssertEqual(t, _decStr(t, Base58FlickrEncoding, "48638rmBiUzG5NKQoX4KcuE5C8paCFACnE28F7qDx13PRtennAmYSSJQ5gJSRihf5ZDyEQS4UimtihR7uARt4wbty2fW9duTQTM9n1DwUBevreyzGwu6W4YSgrvQgCPDxsiE1mCdZsF8VEBpuHHEiJyw"), "If debugging is the process of removing software bugs, then programming must be the process of putting them in.") | ||||
| } | ||||
|  | ||||
| func tst.AssertEqual(t *testing.T, actual string, expected string) { | ||||
| 	if actual != expected { | ||||
| 		t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual, expected) | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -13,6 +13,7 @@ type Regex interface { | ||||
| 	ReplaceAllFunc(haystack string, repl func(string) string) string | ||||
| 	RemoveAll(haystack string) string | ||||
| 	GroupCount() int | ||||
| 	String() string | ||||
| } | ||||
|  | ||||
| type regexWrapper struct { | ||||
| @@ -42,6 +43,7 @@ func W(rex *regexp.Regexp) Regex { | ||||
|  | ||||
| // --------------------------------------------------------------------------------------------------------------------- | ||||
|  | ||||
| // IsMatch reports whether the string s contains any match of the regular expression re. | ||||
| func (w *regexWrapper) IsMatch(haystack string) bool { | ||||
| 	return w.rex.MatchString(haystack) | ||||
| } | ||||
| @@ -88,6 +90,11 @@ func (w *regexWrapper) GroupCount() int { | ||||
| 	return len(w.subnames) - 1 | ||||
| } | ||||
|  | ||||
| // String returns the source text used to compile the regular expression. | ||||
| func (w *regexWrapper) String() string { | ||||
| 	return w.rex.String() | ||||
| } | ||||
|  | ||||
| // --------------------------------------------------------------------------------------------------------------------- | ||||
|  | ||||
| func (m RegexMatch) FullMatch() RegexMatchGroup { | ||||
|   | ||||
| @@ -69,7 +69,7 @@ func (t *RFC3339Time) UnmarshalText(data []byte) error { | ||||
| } | ||||
|  | ||||
| func (t *RFC3339Time) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { | ||||
| 	if bt == bsontype.Null { | ||||
| 	if bt == bson.TypeNull { | ||||
| 		// we can't set nil in UnmarshalBSONValue (so we use default(struct)) | ||||
| 		// Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values | ||||
| 		// https://stackoverflow.com/questions/75167597 | ||||
| @@ -77,7 +77,7 @@ func (t *RFC3339Time) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { | ||||
| 		*t = RFC3339Time{} | ||||
| 		return nil | ||||
| 	} | ||||
| 	if bt != bsontype.DateTime { | ||||
| 	if bt != bson.TypeDateTime { | ||||
| 		return errors.New(fmt.Sprintf("cannot unmarshal %v into RFC3339Time", bt)) | ||||
| 	} | ||||
| 	var tt time.Time | ||||
|   | ||||
| @@ -69,7 +69,7 @@ func (t *RFC3339NanoTime) UnmarshalText(data []byte) error { | ||||
| } | ||||
|  | ||||
| func (t *RFC3339NanoTime) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { | ||||
| 	if bt == bsontype.Null { | ||||
| 	if bt == bson.TypeNull { | ||||
| 		// we can't set nil in UnmarshalBSONValue (so we use default(struct)) | ||||
| 		// Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values | ||||
| 		// https://stackoverflow.com/questions/75167597 | ||||
| @@ -77,7 +77,7 @@ func (t *RFC3339NanoTime) UnmarshalBSONValue(bt bsontype.Type, data []byte) erro | ||||
| 		*t = RFC3339NanoTime{} | ||||
| 		return nil | ||||
| 	} | ||||
| 	if bt != bsontype.DateTime { | ||||
| 	if bt != bson.TypeDateTime { | ||||
| 		return errors.New(fmt.Sprintf("cannot unmarshal %v into RFC3339NanoTime", bt)) | ||||
| 	} | ||||
| 	var tt time.Time | ||||
|   | ||||
| @@ -2,6 +2,7 @@ package rfctime | ||||
|  | ||||
| import ( | ||||
| 	"encoding/json" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/timeext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"testing" | ||||
| 	"time" | ||||
| @@ -13,7 +14,7 @@ func TestRoundtrip(t *testing.T) { | ||||
| 		Value RFC3339NanoTime `json:"v"` | ||||
| 	} | ||||
|  | ||||
| 	val1 := NewRFC3339Nano(time.Unix(0, 1675951556820915171)) | ||||
| 	val1 := NewRFC3339Nano(time.Unix(0, 1675951556820915171).In(timeext.TimezoneBerlin)) | ||||
| 	w1 := Wrap{val1} | ||||
|  | ||||
| 	jstr1, err := json.Marshal(w1) | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| package termext | ||||
|  | ||||
| import ( | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"math/rand" | ||||
| 	"testing" | ||||
| ) | ||||
| @@ -32,9 +33,3 @@ func TestColor(t *testing.T) { | ||||
| 	tst.AssertEqual(t, CleanString(Gray("test")), "test") | ||||
| 	tst.AssertEqual(t, CleanString(White("test")), "test") | ||||
| } | ||||
|  | ||||
| func tst.AssertEqual(t *testing.T, actual string, expected string) { | ||||
| 	if actual != expected { | ||||
| 		t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual, expected) | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -7,56 +7,56 @@ import ( | ||||
|  | ||||
| func TestParseDurationShortString(t *testing.T) { | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1), "1s") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1), "1sec") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1), "1second") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1), "1seconds") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(100), "100second") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(100), "100seconds") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77second") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77seconds") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(50), "50s") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(50), "50sec") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1), "1second") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(50), "50seconds") | ||||
| 	assertPDSSEqual(t, FromSeconds(1), "1s") | ||||
| 	assertPDSSEqual(t, FromSeconds(1), "1sec") | ||||
| 	assertPDSSEqual(t, FromSeconds(1), "1second") | ||||
| 	assertPDSSEqual(t, FromSeconds(1), "1seconds") | ||||
| 	assertPDSSEqual(t, FromSeconds(100), "100second") | ||||
| 	assertPDSSEqual(t, FromSeconds(100), "100seconds") | ||||
| 	assertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77second") | ||||
| 	assertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77seconds") | ||||
| 	assertPDSSEqual(t, FromSeconds(50), "50s") | ||||
| 	assertPDSSEqual(t, FromSeconds(50), "50sec") | ||||
| 	assertPDSSEqual(t, FromSeconds(1), "1second") | ||||
| 	assertPDSSEqual(t, FromSeconds(50), "50seconds") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromMinutes(10), "10m") | ||||
| 	tst.AssertPDSSEqual(t, FromMinutes(10), "10min") | ||||
| 	tst.AssertPDSSEqual(t, FromMinutes(1), "1minute") | ||||
| 	tst.AssertPDSSEqual(t, FromMinutes(10), "10minutes") | ||||
| 	tst.AssertPDSSEqual(t, FromMinutes(10.5), "10.5minutes") | ||||
| 	assertPDSSEqual(t, FromMinutes(10), "10m") | ||||
| 	assertPDSSEqual(t, FromMinutes(10), "10min") | ||||
| 	assertPDSSEqual(t, FromMinutes(1), "1minute") | ||||
| 	assertPDSSEqual(t, FromMinutes(10), "10minutes") | ||||
| 	assertPDSSEqual(t, FromMinutes(10.5), "10.5minutes") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromMilliseconds(100), "100ms") | ||||
| 	tst.AssertPDSSEqual(t, FromMilliseconds(100), "100milliseconds") | ||||
| 	tst.AssertPDSSEqual(t, FromMilliseconds(100), "100millisecond") | ||||
| 	assertPDSSEqual(t, FromMilliseconds(100), "100ms") | ||||
| 	assertPDSSEqual(t, FromMilliseconds(100), "100milliseconds") | ||||
| 	assertPDSSEqual(t, FromMilliseconds(100), "100millisecond") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromNanoseconds(99235), "99235ns") | ||||
| 	tst.AssertPDSSEqual(t, FromNanoseconds(99235), "99235nanoseconds") | ||||
| 	tst.AssertPDSSEqual(t, FromNanoseconds(99235), "99235nanosecond") | ||||
| 	assertPDSSEqual(t, FromNanoseconds(99235), "99235ns") | ||||
| 	assertPDSSEqual(t, FromNanoseconds(99235), "99235nanoseconds") | ||||
| 	assertPDSSEqual(t, FromNanoseconds(99235), "99235nanosecond") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromMicroseconds(99235), "99235us") | ||||
| 	tst.AssertPDSSEqual(t, FromMicroseconds(99235), "99235microseconds") | ||||
| 	tst.AssertPDSSEqual(t, FromMicroseconds(99235), "99235microsecond") | ||||
| 	assertPDSSEqual(t, FromMicroseconds(99235), "99235us") | ||||
| 	assertPDSSEqual(t, FromMicroseconds(99235), "99235microseconds") | ||||
| 	assertPDSSEqual(t, FromMicroseconds(99235), "99235microsecond") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromHours(1), "1h") | ||||
| 	tst.AssertPDSSEqual(t, FromHours(1), "1hour") | ||||
| 	tst.AssertPDSSEqual(t, FromHours(2), "2hours") | ||||
| 	assertPDSSEqual(t, FromHours(1), "1h") | ||||
| 	assertPDSSEqual(t, FromHours(1), "1hour") | ||||
| 	assertPDSSEqual(t, FromHours(2), "2hours") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1), "1d") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1), "1day") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(10), "10days") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1), "1days") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(10), "10day") | ||||
| 	assertPDSSEqual(t, FromDays(1), "1d") | ||||
| 	assertPDSSEqual(t, FromDays(1), "1day") | ||||
| 	assertPDSSEqual(t, FromDays(10), "10days") | ||||
| 	assertPDSSEqual(t, FromDays(1), "1days") | ||||
| 	assertPDSSEqual(t, FromDays(10), "10day") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d10m") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10)+FromSeconds(200), "1d10m200sec") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d:10m") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d 10m") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d,10m") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d, 10m") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromSeconds(1000), "1d   1000seconds") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d10m") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromMinutes(10)+FromSeconds(200), "1d10m200sec") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d:10m") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d 10m") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d,10m") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d, 10m") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromSeconds(1000), "1d   1000seconds") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1), "86400s") | ||||
| 	assertPDSSEqual(t, FromDays(1), "86400s") | ||||
| } | ||||
|  | ||||
| func assertPDSSEqual(t *testing.T, expected time.Duration, fmt string) { | ||||
|   | ||||
| @@ -22,6 +22,17 @@ func TimeToDatePart(t time.Time, tz *time.Location) time.Time { | ||||
| 	return time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location()) | ||||
| } | ||||
|  | ||||
| // TimeToDayStart returns a timestamp at the start of the day which contains t (= 00:00:00) | ||||
| func TimeToDayStart(t time.Time, tz *time.Location) time.Time { | ||||
| 	t = t.In(tz) | ||||
| 	return time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location()) | ||||
| } | ||||
|  | ||||
| // TimeToDayEnd returns a timestamp at the end of the day which contains t (= 23:59:59) | ||||
| func TimeToDayEnd(t time.Time, tz *time.Location) time.Time { | ||||
| 	return TimeToDayStart(t, tz).AddDate(0, 0, 1).Add(-1) | ||||
| } | ||||
|  | ||||
| // TimeToWeekStart returns a timestamp at the start of the week which contains t (= Monday 00:00:00) | ||||
| func TimeToWeekStart(t time.Time, tz *time.Location) time.Time { | ||||
| 	t = TimeToDatePart(t, tz) | ||||
|   | ||||
| @@ -5,6 +5,7 @@ import ( | ||||
| 	"go.mongodb.org/mongo-driver/bson/bsontype" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	ct "gogs.mikescher.com/BlackForestBytes/goext/cursortoken" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"reflect" | ||||
| ) | ||||
| @@ -66,21 +67,25 @@ func (c *Coll[TData]) Indexes() mongo.IndexView { | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) Drop(ctx context.Context) error { | ||||
| 	return c.coll.Drop(ctx) | ||||
| 	err := c.coll.Drop(ctx) | ||||
| 	if err != nil { | ||||
| 		return exerr.Wrap(err, "failed to drop collection").Str("collection", c.Name()).Build() | ||||
| 	} | ||||
| 	return 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) | ||||
| 	if err != nil { | ||||
| 		return ct.CursorToken{}, err | ||||
| 		return ct.CursorToken{}, exerr.Wrap(err, "failed to get (primary) field-value as token-string").Type("lastEntity", lastEntity).Str("fieldPrimary", fieldPrimary).Build() | ||||
| 	} | ||||
|  | ||||
| 	valueSeconary := "" | ||||
| 	if fieldSecondary != nil && dirSecondary != nil { | ||||
| 		valueSeconary, err = c.getFieldValueAsTokenString(lastEntity, *fieldSecondary) | ||||
| 		if err != nil { | ||||
| 			return ct.CursorToken{}, err | ||||
| 			return ct.CursorToken{}, exerr.Wrap(err, "failed to get (secondary) field-value as token-string").Type("lastEntity", lastEntity).StrPtr("fieldSecondary", fieldSecondary).Build() | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
|   | ||||
| @@ -2,12 +2,17 @@ package wmo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) decodeSingle(ctx context.Context, dec Decodable) (TData, error) { | ||||
| 	if c.customDecoder != nil { | ||||
|  | ||||
| 		return (*c.customDecoder)(ctx, dec) | ||||
| 		res, err := (*c.customDecoder)(ctx, dec) | ||||
| 		if err != nil { | ||||
| 			return *new(TData), exerr.Wrap(err, "failed to decode single entity with custom-decoder").Type("decoder", *c.customDecoder).Build() | ||||
| 		} | ||||
| 		return res, nil | ||||
|  | ||||
| 	} else { | ||||
|  | ||||
| @@ -15,7 +20,7 @@ func (c *Coll[TData]) decodeSingle(ctx context.Context, dec Decodable) (TData, e | ||||
|  | ||||
| 		err := dec.Decode(&res) | ||||
| 		if err != nil { | ||||
| 			return *new(TData), err | ||||
| 			return *new(TData), exerr.Wrap(err, "failed to decode single entity").Type("target-type", res).Build() | ||||
| 		} | ||||
|  | ||||
| 		return res, nil | ||||
| @@ -31,7 +36,7 @@ func (c *Coll[TData]) decodeAll(ctx context.Context, cursor Cursorable) ([]TData | ||||
| 		for cursor.Next(ctx) { | ||||
| 			entry, err := (*c.customDecoder)(ctx, cursor) | ||||
| 			if err != nil { | ||||
| 				return nil, err | ||||
| 				return nil, exerr.Wrap(err, "failed to decode entity with custom-decoder").Type("decoder", *c.customDecoder).Build() | ||||
| 			} | ||||
| 			res = append(res, entry) | ||||
| 		} | ||||
| @@ -44,7 +49,7 @@ func (c *Coll[TData]) decodeAll(ctx context.Context, cursor Cursorable) ([]TData | ||||
|  | ||||
| 		err := cursor.All(ctx, &res) | ||||
| 		if err != nil { | ||||
| 			return nil, err | ||||
| 			return nil, exerr.Wrap(err, "failed to batch-decode entity").Type("target-type", res).Build() | ||||
| 		} | ||||
|  | ||||
| 		return res, nil | ||||
|   | ||||
| @@ -1,9 +1,9 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"errors" | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	ct "gogs.mikescher.com/BlackForestBytes/goext/cursortoken" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func CreatePagination[TData any](coll *Coll[TData], token ct.CursorToken, fieldPrimary string, sortPrimary ct.SortDirection, fieldSecondary *string, sortSecondary *ct.SortDirection, pageSize *int) ([]bson.D, error) { | ||||
| @@ -13,7 +13,7 @@ func CreatePagination[TData any](coll *Coll[TData], token ct.CursorToken, fieldP | ||||
|  | ||||
| 	valuePrimary, err := coll.getTokenValueAsMongoType(token.ValuePrimary, fieldPrimary) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 		return nil, exerr.Wrap(err, "failed to get (primary) token-value as mongo-type").Build() | ||||
| 	} | ||||
|  | ||||
| 	if sortPrimary == ct.SortASC { | ||||
| @@ -30,7 +30,7 @@ func CreatePagination[TData any](coll *Coll[TData], token ct.CursorToken, fieldP | ||||
|  | ||||
| 		valueSecondary, err := coll.getTokenValueAsMongoType(token.ValueSecondary, *fieldSecondary) | ||||
| 		if err != nil { | ||||
| 			return nil, err | ||||
| 			return nil, exerr.Wrap(err, "failed to get (secondary) token-value as mongo-type").Build() | ||||
| 		} | ||||
|  | ||||
| 		if *sortSecondary == ct.SortASC { | ||||
| @@ -73,7 +73,7 @@ func CreatePagination[TData any](coll *Coll[TData], token ct.CursorToken, fieldP | ||||
|  | ||||
| 	} else { | ||||
|  | ||||
| 		return nil, errors.New("unknown ct mode: " + string(token.Mode)) | ||||
| 		return nil, exerr.New(exerr.TypeInternal, "unknown ct mode: "+string(token.Mode)).Any("token.Mode", token.Mode).Build() | ||||
|  | ||||
| 	} | ||||
|  | ||||
|   | ||||
| @@ -2,20 +2,20 @@ package wmo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"errors" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	"go.mongodb.org/mongo-driver/mongo/options" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| 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 | ||||
| 		return nil, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Any("options", opts).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	res, err := c.decodeAll(ctx, cursor) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 		return nil, exerr.Wrap(err, "failed to decode values").Build() | ||||
| 	} | ||||
|  | ||||
| 	return res, nil | ||||
| @@ -24,13 +24,13 @@ func (c *Coll[TData]) Aggregate(ctx context.Context, pipeline mongo.Pipeline, op | ||||
| func (c *Coll[TData]) AggregateOneOpt(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 | ||||
| 		return nil, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Any("options", opts).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	if cursor.Next(ctx) { | ||||
| 		v, err := c.decodeSingle(ctx, cursor) | ||||
| 		if err != nil { | ||||
| 			return nil, err | ||||
| 			return nil, exerr.Wrap(err, "failed to decode single value").Build() | ||||
| 		} | ||||
| 		return &v, nil | ||||
| 	} | ||||
| @@ -41,16 +41,16 @@ func (c *Coll[TData]) AggregateOneOpt(ctx context.Context, pipeline mongo.Pipeli | ||||
| func (c *Coll[TData]) AggregateOne(ctx context.Context, pipeline mongo.Pipeline, opts ...*options.AggregateOptions) (TData, error) { | ||||
| 	cursor, err := c.coll.Aggregate(ctx, pipeline, opts...) | ||||
| 	if err != nil { | ||||
| 		return *new(TData), err | ||||
| 		return *new(TData), exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Any("options", opts).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	if cursor.Next(ctx) { | ||||
| 		v, err := c.decodeSingle(ctx, cursor) | ||||
| 		if err != nil { | ||||
| 			return *new(TData), err | ||||
| 			return *new(TData), exerr.Wrap(err, "failed to decode single value").Build() | ||||
| 		} | ||||
| 		return v, nil | ||||
| 	} | ||||
|  | ||||
| 	return *new(TData), errors.New("no document in result") | ||||
| 	return *new(TData), exerr.Wrap(mongo.ErrNoDocuments, "no document in result").Build() | ||||
| } | ||||
|   | ||||
| @@ -4,12 +4,13 @@ import ( | ||||
| 	"context" | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) DeleteOneByID(ctx context.Context, id EntityID) error { | ||||
| 	_, err := c.coll.DeleteOne(ctx, bson.M{"_id": id}) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 		return exerr.Wrap(err, "mongo-query[delete-one-by-id] failed").Id("id", id).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| @@ -18,7 +19,7 @@ func (c *Coll[TData]) DeleteOneByID(ctx context.Context, id EntityID) error { | ||||
| func (c *Coll[TData]) DeleteOne(ctx context.Context, filterQuery bson.M) error { | ||||
| 	_, err := c.coll.DeleteOne(ctx, filterQuery) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 		return exerr.Wrap(err, "mongo-query[delete-one] failed").Any("filterQuery", filterQuery).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| @@ -27,7 +28,7 @@ func (c *Coll[TData]) DeleteOne(ctx context.Context, filterQuery bson.M) error { | ||||
| 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 nil, exerr.Wrap(err, "mongo-query[delete-many] failed").Any("filterQuery", filterQuery).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	return res, nil | ||||
|   | ||||
| @@ -2,13 +2,21 @@ package wmo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"errors" | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	"go.mongodb.org/mongo-driver/mongo/options" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) FindOne(ctx context.Context, filter bson.M) (TData, error) { | ||||
| 	mongoRes := c.coll.FindOne(ctx, filter) | ||||
| 	if err := mongoRes.Err(); err != nil { | ||||
| 		return *new(TData), exerr.Wrap(err, "mongo-query[find-one] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("filter", filter). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return c.decodeSingle(ctx, mongoRes) | ||||
| } | ||||
| @@ -17,11 +25,11 @@ func (c *Coll[TData]) FindOneOpt(ctx context.Context, filter bson.M) (*TData, er | ||||
| 	mongoRes := c.coll.FindOne(ctx, filter) | ||||
|  | ||||
| 	res, err := c.decodeSingle(ctx, mongoRes) | ||||
| 	if err == mongo.ErrNoDocuments { | ||||
| 	if errors.Is(err, mongo.ErrNoDocuments) { | ||||
| 		return nil, nil | ||||
| 	} | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 		return nil, exerr.Wrap(err, "mongo-query[find-one-opt] failed").Any("filter", filter).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	return &res, nil | ||||
| @@ -29,6 +37,12 @@ func (c *Coll[TData]) FindOneOpt(ctx context.Context, filter bson.M) (*TData, er | ||||
|  | ||||
| func (c *Coll[TData]) FindOneByID(ctx context.Context, id EntityID) (TData, error) { | ||||
| 	mongoRes := c.coll.FindOne(ctx, bson.M{"_id": id}) | ||||
| 	if err := mongoRes.Err(); err != nil { | ||||
| 		return *new(TData), exerr.Wrap(err, "mongo-query[find-one-by-id] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Id("id", id). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return c.decodeSingle(ctx, mongoRes) | ||||
| } | ||||
| @@ -37,11 +51,11 @@ func (c *Coll[TData]) FindOneOptByID(ctx context.Context, id EntityID) (*TData, | ||||
| 	mongoRes := c.coll.FindOne(ctx, bson.M{"_id": id}) | ||||
|  | ||||
| 	res, err := c.decodeSingle(ctx, mongoRes) | ||||
| 	if err == mongo.ErrNoDocuments { | ||||
| 	if errors.Is(err, mongo.ErrNoDocuments) { | ||||
| 		return nil, nil | ||||
| 	} | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 		return nil, exerr.Wrap(err, "mongo-query[find-one-opt-by-id] failed").Id("id", id).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	return &res, nil | ||||
| @@ -50,12 +64,12 @@ func (c *Coll[TData]) FindOneOptByID(ctx context.Context, id EntityID) (*TData, | ||||
| 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 | ||||
| 		return nil, exerr.Wrap(err, "mongo-query[find-one-opt] failed").Any("filter", filter).Any("opts", opts).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	res, err := c.decodeAll(ctx, cursor) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 		return nil, exerr.Wrap(err, "failed to decode values").Build() | ||||
| 	} | ||||
|  | ||||
| 	return res, nil | ||||
|   | ||||
| @@ -4,13 +4,14 @@ import ( | ||||
| 	"context" | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| ) | ||||
|  | ||||
| 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 | ||||
| 		return *new(TData), exerr.Wrap(err, "mongo-query[insert-one] failed").Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	mongoRes := c.coll.FindOne(ctx, bson.M{"_id": insRes.InsertedID}) | ||||
| @@ -19,5 +20,10 @@ func (c *Coll[TData]) InsertOne(ctx context.Context, valueIn TData) (TData, erro | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) InsertMany(ctx context.Context, valueIn []TData) (*mongo.InsertManyResult, error) { | ||||
| 	return c.coll.InsertMany(ctx, langext.ArrayToInterface(valueIn)) | ||||
| 	insRes, err := c.coll.InsertMany(ctx, langext.ArrayToInterface(valueIn)) | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "mongo-query[insert-many] failed").Int("len(valueIn)", len(valueIn)).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	return insRes, nil | ||||
| } | ||||
|   | ||||
| @@ -5,6 +5,7 @@ import ( | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	ct "gogs.mikescher.com/BlackForestBytes/goext/cursortoken" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int, inTok ct.CursorToken) ([]TData, ct.CursorToken, error) { | ||||
| @@ -35,21 +36,31 @@ func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int, | ||||
|  | ||||
| 	paginationPipeline, err := CreatePagination(c, inTok, sortPrimary, sortDirPrimary, sortSecondary, sortDirSecondary, pageSize) | ||||
| 	if err != nil { | ||||
| 		return nil, ct.CursorToken{}, err | ||||
| 		return nil, ct.CursorToken{}, exerr. | ||||
| 			Wrap(err, "failed to create pagination"). | ||||
| 			WithType(exerr.TypeCursorTokenDecode). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("inTok", inTok). | ||||
| 			Any("sortPrimary", sortPrimary). | ||||
| 			Any("sortDirPrimary", sortDirPrimary). | ||||
| 			Any("sortSecondary", sortSecondary). | ||||
| 			Any("sortDirSecondary", sortDirSecondary). | ||||
| 			Any("pageSize", pageSize). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	pipeline = append(pipeline, paginationPipeline...) | ||||
|  | ||||
| 	cursor, err := c.coll.Aggregate(ctx, pipeline) | ||||
| 	if err != nil { | ||||
| 		return nil, ct.CursorToken{}, err | ||||
| 		return nil, ct.CursorToken{}, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	// fast branch | ||||
| 	if pageSize == nil { | ||||
| 		entries, err := c.decodeAll(ctx, cursor) | ||||
| 		if err != nil { | ||||
| 			return nil, ct.CursorToken{}, err | ||||
| 			return nil, ct.CursorToken{}, exerr.Wrap(err, "failed to all-decode entities").Build() | ||||
| 		} | ||||
| 		return entries, ct.End(), nil | ||||
| 	} | ||||
| @@ -59,7 +70,7 @@ func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int, | ||||
| 		var entry TData | ||||
| 		entry, err = c.decodeSingle(ctx, cursor) | ||||
| 		if err != nil { | ||||
| 			return nil, ct.CursorToken{}, err | ||||
| 			return nil, ct.CursorToken{}, exerr.Wrap(err, "failed to decode entity").Build() | ||||
| 		} | ||||
| 		entities = append(entities, entry) | ||||
| 	} | ||||
| @@ -74,7 +85,7 @@ func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int, | ||||
|  | ||||
| 	nextToken, err := c.createToken(sortPrimary, sortDirPrimary, sortSecondary, sortDirSecondary, last, pageSize) | ||||
| 	if err != nil { | ||||
| 		return nil, ct.CursorToken{}, err | ||||
| 		return nil, ct.CursorToken{}, exerr.Wrap(err, "failed to create (out)-token").Build() | ||||
| 	} | ||||
|  | ||||
| 	return entities, nextToken, nil | ||||
| @@ -91,14 +102,14 @@ func (c *Coll[TData]) Count(ctx context.Context, filter ct.Filter) (int64, error | ||||
|  | ||||
| 	cursor, err := c.coll.Aggregate(ctx, pipeline) | ||||
| 	if err != nil { | ||||
| 		return 0, err | ||||
| 		return 0, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	if cursor.Next(ctx) { | ||||
| 		v := countRes{} | ||||
| 		err = cursor.Decode(&v) | ||||
| 		if err != nil { | ||||
| 			return 0, err | ||||
| 			return 0, exerr.Wrap(err, "failed to decode entity").Build() | ||||
| 		} | ||||
| 		return v.Count, nil | ||||
| 	} | ||||
|   | ||||
| @@ -5,10 +5,18 @@ import ( | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	"go.mongodb.org/mongo-driver/mongo/options" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) FindOneAndUpdate(ctx context.Context, filterQuery bson.M, updateQuery bson.M) (TData, error) { | ||||
| 	mongoRes := c.coll.FindOneAndUpdate(ctx, filterQuery, updateQuery, options.FindOneAndUpdate().SetReturnDocument(options.After)) | ||||
| 	if err := mongoRes.Err(); err != nil { | ||||
| 		return *new(TData), exerr.Wrap(err, "mongo-query[find-one-and-update] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("filterQuery", filterQuery). | ||||
| 			Any("updateQuery", updateQuery). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return c.decodeSingle(ctx, mongoRes) | ||||
| } | ||||
| @@ -16,7 +24,11 @@ func (c *Coll[TData]) FindOneAndUpdate(ctx context.Context, filterQuery bson.M, | ||||
| 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 exerr.Wrap(err, "mongo-query[update-one] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("filterQuery", filterQuery). | ||||
| 			Any("updateQuery", updateQuery). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| @@ -25,7 +37,11 @@ func (c *Coll[TData]) UpdateOne(ctx context.Context, filterQuery bson.M, updateQ | ||||
| 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 exerr.Wrap(err, "mongo-query[update-one-by-id] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Id("id", id). | ||||
| 			Any("updateQuery", updateQuery). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| @@ -34,7 +50,11 @@ func (c *Coll[TData]) UpdateOneByID(ctx context.Context, id EntityID, updateQuer | ||||
| 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 nil, exerr.Wrap(err, "mongo-query[update-many] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("filterQuery", filterQuery). | ||||
| 			Any("updateQuery", updateQuery). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return res, nil | ||||
| @@ -43,7 +63,10 @@ func (c *Coll[TData]) UpdateMany(ctx context.Context, filterQuery bson.M, update | ||||
| func (c *Coll[TData]) ReplaceOne(ctx context.Context, filterQuery bson.M, value TData) error { | ||||
| 	_, err := c.coll.UpdateOne(ctx, filterQuery, bson.M{"$set": value}) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 		return exerr.Wrap(err, "mongo-query[replace-one] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("filterQuery", filterQuery). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| @@ -51,6 +74,12 @@ func (c *Coll[TData]) ReplaceOne(ctx context.Context, filterQuery bson.M, value | ||||
|  | ||||
| func (c *Coll[TData]) FindOneAndReplace(ctx context.Context, filterQuery bson.M, value TData) (TData, error) { | ||||
| 	mongoRes := c.coll.FindOneAndUpdate(ctx, filterQuery, bson.M{"$set": value}, options.FindOneAndUpdate().SetReturnDocument(options.After)) | ||||
| 	if err := mongoRes.Err(); err != nil { | ||||
| 		return *new(TData), exerr.Wrap(err, "mongo-query[find-one-and-update] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("filterQuery", filterQuery). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return c.decodeSingle(ctx, mongoRes) | ||||
| } | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"errors" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/reflectext" | ||||
| 	"reflect" | ||||
| @@ -138,7 +138,7 @@ func (c *Coll[TData]) getTokenValueAsMongoType(value string, fieldName string) ( | ||||
|  | ||||
| 	fref, err := c.getFieldType(fieldName) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 		return nil, exerr.Wrap(err, "failed to get-field-type").Str("fieldName", fieldName).Build() | ||||
| 	} | ||||
|  | ||||
| 	pss := reflectext.PrimitiveStringSerializer{} | ||||
| @@ -151,7 +151,7 @@ func (c *Coll[TData]) getFieldValueAsTokenString(entity TData, fieldName string) | ||||
|  | ||||
| 	realValue, err := c.getFieldValue(entity, fieldName) | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
| 		return "", exerr.Wrap(err, "failed to get-field-value").Str("fieldName", fieldName).Build() | ||||
| 	} | ||||
|  | ||||
| 	pss := reflectext.PrimitiveStringSerializer{} | ||||
| @@ -169,14 +169,14 @@ func (c *Coll[TData]) getFieldType(fieldName string) (fullTypeRef, error) { | ||||
| 			} | ||||
| 		} | ||||
|  | ||||
| 		return fullTypeRef{}, errors.New("unknown field: '" + fieldName + "' (in any impl)") | ||||
| 		return fullTypeRef{}, exerr.New(exerr.TypeMongoReflection, "unknown field: '"+fieldName+"' (in any impl)").Str("fieldName", fieldName).Build() | ||||
|  | ||||
| 	} else { | ||||
|  | ||||
| 		if r, ok := c.dataTypeMap[fieldName]; ok { | ||||
| 			return r, nil | ||||
| 		} else { | ||||
| 			return fullTypeRef{}, errors.New("unknown field: '" + fieldName + "'") | ||||
| 			return fullTypeRef{}, exerr.New(exerr.TypeMongoReflection, "unknown field: '"+fieldName+"'").Str("fieldName", fieldName).Build() | ||||
| 		} | ||||
|  | ||||
| 	} | ||||
| @@ -196,10 +196,10 @@ func (c *Coll[TData]) getFieldValue(data TData, fieldName string) (any, error) { | ||||
| 				rval := reflect.ValueOf(data) | ||||
| 				return rval.FieldByIndex(fref.Index).Interface(), nil | ||||
| 			} else { | ||||
| 				return nil, errors.New("unknown bson field '" + fieldName + "' in type '" + rval.Type().String() + "'") | ||||
| 				return nil, exerr.New(exerr.TypeMongoReflection, "unknown bson field '"+fieldName+"' in type '"+rval.Type().String()+"'").Str("fieldName", fieldName).Type("rval", rval).Build() | ||||
| 			} | ||||
| 		} else { | ||||
| 			return nil, errors.New("unknown TData type: '" + rval.Type().String() + "'") | ||||
| 			return nil, exerr.New(exerr.TypeMongoReflection, "unknown TData type: '"+rval.Type().String()+"'").Type("rval", rval).Build() | ||||
| 		} | ||||
|  | ||||
| 	} else { | ||||
| @@ -208,7 +208,7 @@ func (c *Coll[TData]) getFieldValue(data TData, fieldName string) (any, error) { | ||||
| 			rval := reflect.ValueOf(data) | ||||
| 			return rval.FieldByIndex(fref.Index).Interface(), nil | ||||
| 		} else { | ||||
| 			return nil, errors.New("unknown bson field '" + fieldName + "'") | ||||
| 			return nil, exerr.New(exerr.TypeMongoReflection, "unknown bson field '"+fieldName+"'").Str("fieldName", fieldName).Build() | ||||
| 		} | ||||
|  | ||||
| 	} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user