chore: add package data_provider

mvach · mvach · commit 77e133ff64e8 · 2026-01-19T15:26:54.000+01:00
diff --git a/app/instances_processor.go b/app/instances_processor.go
@@ -3,6 +3,7 @@ package app
 import (
 	"ctRestClient/config"
 	"ctRestClient/csv"
+	"ctRestClient/data_provider"
 	"ctRestClient/httpclient"
 	"ctRestClient/logger"
 	"ctRestClient/rest"
@@ -17,8 +18,8 @@ type InstancesProcessor interface {
 		groupExporter GroupExporter,
 		csvWriter csv.CSVFileWriter,
 		rootDir string,
-		personDataProvider csv.FileDataProvider,
-		blocklistsDataProvider csv.BlockListDataProvider,
+		personDataProvider data_provider.FileDataProvider,
+		blocklistsDataProvider data_provider.BlockListDataProvider,
 		keepassCli KeepassCli,
 	) error
 }
@@ -42,8 +43,8 @@ func (p instancesProcessor) Process(
 	groupExporter GroupExporter,
 	csvWriter csv.CSVFileWriter,
 	rootDir string,
-	fileDataProvider csv.FileDataProvider,
-	blocklistsDataProvider csv.BlockListDataProvider,
+	fileDataProvider data_provider.FileDataProvider,
+	blocklistsDataProvider data_provider.BlockListDataProvider,
 	keepassCli KeepassCli,
 ) error {
 	for _, instance := range p.config.Instances {
diff --git a/app/instances_processor_test.go b/app/instances_processor_test.go
@@ -5,6 +5,7 @@ import (
 	"ctRestClient/app/appfakes"
 	"ctRestClient/config"
 	"ctRestClient/csv/csvfakes"
+	"ctRestClient/data_provider/data_providerfakes"
 	"ctRestClient/logger/loggerfakes"
 	"encoding/json"
 	"errors"
@@ -21,8 +22,8 @@ var _ = Describe("InstanceProcessor", func() {
 		csvWriter              *csvfakes.FakeCSVFileWriter
 		logger                 *loggerfakes.FakeLogger
 		keepassCli             *appfakes.FakeKeepassCli
-		personDataProvider     *csvfakes.FakeFileDataProvider
-		blocklistsDataProvider *csvfakes.FakeBlockListDataProvider
+		personDataProvider     *data_providerfakes.FakeFileDataProvider
+		blocklistsDataProvider *data_providerfakes.FakeBlockListDataProvider
 		cfg                    config.Config
 		instancesProcessor     app.InstancesProcessor
 		result                 []json.RawMessage
@@ -33,8 +34,8 @@ var _ = Describe("InstanceProcessor", func() {
 		csvWriter = &csvfakes.FakeCSVFileWriter{}
 		logger = &loggerfakes.FakeLogger{}
 		keepassCli = &appfakes.FakeKeepassCli{}
-		personDataProvider = &csvfakes.FakeFileDataProvider{}
-		blocklistsDataProvider = &csvfakes.FakeBlockListDataProvider{}
+		personDataProvider = &data_providerfakes.FakeFileDataProvider{}
+		blocklistsDataProvider = &data_providerfakes.FakeBlockListDataProvider{}
 
 		cfg = config.Config{
 			Instances: []config.Instance{
@@ -53,12 +54,12 @@ var _ = Describe("InstanceProcessor", func() {
 
 		instancesProcessor = app.NewInstancesProcessor(cfg, logger)
 
-		person1 := `{	
+		person1 := `{
             "id": 1,
             "firstName": "foo_firstname",
             "lastName": "foo_lastname"
         }`
-		person2 := `{	
+		person2 := `{
             "id": 2,
             "firstName": "bar_firstname",
             "lastName": "bar_lastname"
diff --git a/csv/person_data.go b/csv/person_data.go
@@ -2,6 +2,7 @@ package csv
 
 import (
 	"ctRestClient/config"
+	"ctRestClient/data_provider"
 	"ctRestClient/logger"
 	"encoding/json"
 	"fmt"
@@ -15,8 +16,8 @@ type personData struct {
 func NewPersonData(
 	persons []json.RawMessage,
 	group config.Group,
-	fileDataProvider FileDataProvider,
-	blocklistsDataProvider BlockListDataProvider,
+	fileDataProvider data_provider.FileDataProvider,
+	blocklistsDataProvider data_provider.BlockListDataProvider,
 	logger logger.Logger) (CsvData, error) {
 	csvRecords := make([][]string, 0)
 	fields := group.Fields
diff --git a/csv/person_data_test.go b/csv/person_data_test.go
@@ -3,7 +3,7 @@ package csv_test
 import (
 	"ctRestClient/config"
 	"ctRestClient/csv"
-	"ctRestClient/csv/csvfakes"
+	"ctRestClient/data_provider/data_providerfakes"
 	"ctRestClient/logger/loggerfakes"
 	"encoding/json"
 	"errors"
@@ -20,27 +20,27 @@ var _ = Describe("PersonData", func() {
 
 	var (
 		persons                []json.RawMessage
-		fileDataProvider       *csvfakes.FakeFileDataProvider
-		blocklistsDataProvider *csvfakes.FakeBlockListDataProvider
+		fileDataProvider       *data_providerfakes.FakeFileDataProvider
+		blocklistsDataProvider *data_providerfakes.FakeBlockListDataProvider
 		logger                 *loggerfakes.FakeLogger
 	)
 
 	BeforeEach(func() {
-		person1 := `{	
+		person1 := `{
             "id": 1,
             "firstName": "foo_firstname",
             "lastName": "foo_lastname",
 			"height": 2.75
         }`
-		person2 := `{	
+		person2 := `{
             "id": 2,
             "firstName": "bar_firstname",
             "lastName": "bar_lastname",
 			"height": 1.0
         }`
 		persons = []json.RawMessage{json.RawMessage(person1), json.RawMessage(person2)}
-		fileDataProvider = &csvfakes.FakeFileDataProvider{}
-		blocklistsDataProvider = &csvfakes.FakeBlockListDataProvider{}
+		fileDataProvider = &data_providerfakes.FakeFileDataProvider{}
+		blocklistsDataProvider = &data_providerfakes.FakeBlockListDataProvider{}
 		logger = &loggerfakes.FakeLogger{}
 	})
 
@@ -165,7 +165,7 @@ var _ = Describe("PersonData", func() {
 		})
 
 		It("returns mapped data for string key fields", func() {
-			person1 := `{	
+			person1 := `{
 				"id": 1,
 				"key": "value"
 			}`
@@ -190,7 +190,7 @@ var _ = Describe("PersonData", func() {
 		})
 
 		It("returns empty string for string key fields that are not mapped", func() {
-			person1 := `{	
+			person1 := `{
 				"id": 1,
 				"key": "value"
 			}`
@@ -215,7 +215,7 @@ var _ = Describe("PersonData", func() {
 		})
 
 		It("returns mapped data for float64 key fields", func() {
-			person1 := `{	
+			person1 := `{
 				"id": 1,
 				"key": 1.2
 			}`
@@ -240,7 +240,7 @@ var _ = Describe("PersonData", func() {
 		})
 
 		It("returns empty string for float64 key fields that are not mapped", func() {
-			person1 := `{	
+			person1 := `{
 				"id": 1,
 				"key": 1.2
 			}`
diff --git a/data_provider/blocklist_data_provider.go b/data_provider/blocklist_data_provider.go
@@ -1,4 +1,4 @@
-package csv
+package data_provider
 
 import (
 	"bytes"
diff --git a/data_provider/blocklist_data_provider_test.go b/data_provider/blocklist_data_provider_test.go
@@ -1,8 +1,8 @@
-package csv_test
+package data_provider_test
 
 import (
 	"ctRestClient/config"
-	"ctRestClient/csv"
+	"ctRestClient/data_provider"
 	"ctRestClient/logger/loggerfakes"
 	"encoding/json"
 	"os"
@@ -17,7 +17,7 @@ var _ = Describe("BlocklistDataProvider", func() {
 	var (
 		err         error
 		tempDataDir string
-		dp          csv.BlockListDataProvider
+		dp          data_provider.BlockListDataProvider
 		logger      *loggerfakes.FakeLogger
 		personJson  map[string]json.RawMessage
 		group       config.Group
@@ -37,7 +37,7 @@ var _ = Describe("BlocklistDataProvider", func() {
 			"weddingDate":  json.RawMessage(`null`),
 		}
 		logger = &loggerfakes.FakeLogger{}
-		dp = csv.NewBlockListDataProvider(tempDataDir, logger)
+		dp = data_provider.NewBlockListDataProvider(tempDataDir, logger)
 
 		group = config.Group{Name: "mappedField"}
 	})
diff --git a/data_provider/data_providerfakes/fake_block_list_data_provider.go b/data_provider/data_providerfakes/fake_block_list_data_provider.go
diff --git a/data_provider/data_providerfakes/fake_file_data_provider.go b/data_provider/data_providerfakes/fake_file_data_provider.go
diff --git a/data_provider/file_data_provider.go b/data_provider/file_data_provider.go
@@ -1,4 +1,4 @@
-package csv
+package data_provider
 
 import (
 	"encoding/json"
diff --git a/data_provider/file_data_provider_test.go b/data_provider/file_data_provider_test.go
@@ -1,7 +1,7 @@
-package csv_test
+package data_provider_test
 
 import (
-	"ctRestClient/csv"
+	"ctRestClient/data_provider"
 	"os"
 	"path/filepath"
 
@@ -14,7 +14,7 @@ var _ = Describe("FileDataProvider", func() {
 	var (
 		err            error
 		tempDataDir    string
-		dp             csv.FileDataProvider
+		dp             data_provider.FileDataProvider
 		mappedFilePath string
 	)
 
@@ -36,7 +36,7 @@ var _ = Describe("FileDataProvider", func() {
 
 		err = os.WriteFile(mappedFilePath, []byte(yamlContent), 0644)
 		Expect(err).ToNot(HaveOccurred())
-		dp = csv.NewFileDataProvider(tempDataDir)
+		dp = data_provider.NewFileDataProvider(tempDataDir)
 	})
 
 	AfterEach(func() {
diff --git a/data_provider/generate.go b/data_provider/generate.go
@@ -0,0 +1,3 @@
+package data_provider
+
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate
diff --git a/integration/app_runner.go b/integration/app_runner.go
@@ -4,6 +4,7 @@ import (
 	"ctRestClient/app"
 	"ctRestClient/config"
 	"ctRestClient/csv"
+	"ctRestClient/data_provider"
 	"ctRestClient/logger"
 	"path/filepath"
 )
@@ -21,8 +22,8 @@ func RunApplicationWrapper(config *config.Config, rootDir string, dataDir string
 		app.NewGroupExporter(),
 		csv.NewCSVFileWriter(),
 		rootDir,
-		csv.NewFileDataProvider(filepath.Join(dataDir, "mappings/persons")),
-		csv.NewBlockListDataProvider(filepath.Join(dataDir, "blocklists"), appLogger),
+		data_provider.NewFileDataProvider(filepath.Join(dataDir, "mappings/persons")),
+		data_provider.NewBlockListDataProvider(filepath.Join(dataDir, "blocklists"), appLogger),
 		keepassCli,
 	)
 }
diff --git a/main.go b/main.go
@@ -4,6 +4,7 @@ import (
 	"ctRestClient/app"
 	"ctRestClient/config"
 	"ctRestClient/csv"
+	"ctRestClient/data_provider"
 	"ctRestClient/logger"
 	"flag"
 	"fmt"
@@ -73,8 +74,8 @@ func main() {
 		app.NewGroupExporter(),
 		csv.NewCSVFileWriter(),
 		rootDir,
-		csv.NewFileDataProvider(filepath.Join(dataDir, "mappings/persons")),
-		csv.NewBlockListDataProvider(filepath.Join(dataDir, "blocklists"), appLogger),
+		data_provider.NewFileDataProvider(filepath.Join(dataDir, "mappings/persons")),
+		data_provider.NewBlockListDataProvider(filepath.Join(dataDir, "blocklists"), appLogger),
 		keepassCli,
 	)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package csv`
	`1`	`+package data_provider`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`