From 38b24058a7faf46e0b6840c3cea790fbe7fd7a98 Mon Sep 17 00:00:00 2001
From: Erik Winter <erik@deonticdata.com>
Date: Wed, 18 Sep 2024 07:29:48 +0200
Subject: [PATCH] change modules

---
 cal/go.sum                                |  2 --
 cal/main.go                               | 15 +++++++++------
 {sync/client => sync-client}/client.go    |  0
 sync/main.go                              |  6 +++---
 sync/{service => planner}/handler.go      |  2 +-
 sync/{service => planner}/handler_test.go |  2 +-
 sync/{service => planner}/memory.go       |  2 +-
 sync/{service => planner}/memory_test.go  |  2 +-
 sync/{service => planner}/planner.go      |  2 +-
 sync/{service => planner}/sqlite.go       |  2 +-
 sync/{service => planner}/storage.go      |  2 +-
 11 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 cal/go.sum
 rename {sync/client => sync-client}/client.go (100%)
 rename sync/{service => planner}/handler.go (99%)
 rename sync/{service => planner}/handler_test.go (99%)
 rename sync/{service => planner}/memory.go (97%)
 rename sync/{service => planner}/memory_test.go (99%)
 rename sync/{service => planner}/planner.go (96%)
 rename sync/{service => planner}/sqlite.go (99%)
 rename sync/{service => planner}/storage.go (91%)

diff --git a/cal/go.sum b/cal/go.sum
deleted file mode 100644
index 7790d7c..0000000
--- a/cal/go.sum
+++ /dev/null
@@ -1,2 +0,0 @@
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
diff --git a/cal/main.go b/cal/main.go
index a8ace19..c43acd7 100644
--- a/cal/main.go
+++ b/cal/main.go
@@ -4,13 +4,16 @@ import (
 	"fmt"
 	"os"
 	"time"
+
+	"go-mod.ewintr.nl/planner/sync/client"
+	"go-mod.ewintr.nl/planner/sync/planner"
 )
 
 func main() {
 	fmt.Println("cal")
 
-	c := NewClient("http://localhost:8092", "testKey")
-	items, err := c.Updated([]Kind{KindEvent}, time.Time{})
+	c := client.NewClient("http://localhost:8092", "testKey")
+	items, err := c.Updated([]planner.Kind{planner.KindEvent}, time.Time{})
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
@@ -18,18 +21,18 @@ func main() {
 
 	fmt.Printf("%+v\n", items)
 
-	i := Item{
+	i := planner.Item{
 		ID:      "id-1",
-		Kind:    KindEvent,
+		Kind:    planner.KindEvent,
 		Updated: time.Now(),
 		Body:    "body",
 	}
-	if err := c.Update([]Item{i}); err != nil {
+	if err := c.Update([]planner.Item{i}); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
 
-	items, err = c.Updated([]Kind{KindEvent}, time.Time{})
+	items, err = c.Updated([]planner.Kind{planner.KindEvent}, time.Time{})
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
diff --git a/sync/client/client.go b/sync-client/client.go
similarity index 100%
rename from sync/client/client.go
rename to sync-client/client.go
diff --git a/sync/main.go b/sync/main.go
index 30a6d75..a304745 100644
--- a/sync/main.go
+++ b/sync/main.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"syscall"
 
-	"go-mod.ewintr.nl/planner/sync/service"
+	"go-mod.ewintr.nl/planner/sync/planner"
 )
 
 func main() {
@@ -29,7 +29,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	repo, err := service.NewSqlite(dbPath)
+	repo, err := planner.NewSqlite(dbPath)
 	if err != nil {
 		fmt.Printf("could not open sqlite db: %s", err.Error())
 		os.Exit(1)
@@ -43,7 +43,7 @@ func main() {
 	})
 
 	address := fmt.Sprintf(":%d", port)
-	srv := service.NewServer(repo, apiKey, logger)
+	srv := planner.NewServer(repo, apiKey, logger)
 	go http.ListenAndServe(address, srv)
 
 	logger.Info("service started")
diff --git a/sync/service/handler.go b/sync/planner/handler.go
similarity index 99%
rename from sync/service/handler.go
rename to sync/planner/handler.go
index 47c1eb6..b49f434 100644
--- a/sync/service/handler.go
+++ b/sync/planner/handler.go
@@ -1,4 +1,4 @@
-package service
+package planner
 
 import (
 	"encoding/json"
diff --git a/sync/service/handler_test.go b/sync/planner/handler_test.go
similarity index 99%
rename from sync/service/handler_test.go
rename to sync/planner/handler_test.go
index 5526265..9ee493e 100644
--- a/sync/service/handler_test.go
+++ b/sync/planner/handler_test.go
@@ -1,4 +1,4 @@
-package service
+package planner
 
 import (
 	"bytes"
diff --git a/sync/service/memory.go b/sync/planner/memory.go
similarity index 97%
rename from sync/service/memory.go
rename to sync/planner/memory.go
index 7475285..979e61f 100644
--- a/sync/service/memory.go
+++ b/sync/planner/memory.go
@@ -1,4 +1,4 @@
-package service
+package planner
 
 import (
 	"slices"
diff --git a/sync/service/memory_test.go b/sync/planner/memory_test.go
similarity index 99%
rename from sync/service/memory_test.go
rename to sync/planner/memory_test.go
index 4c17a97..6801fdc 100644
--- a/sync/service/memory_test.go
+++ b/sync/planner/memory_test.go
@@ -1,4 +1,4 @@
-package service
+package planner
 
 import (
 	"testing"
diff --git a/sync/service/planner.go b/sync/planner/planner.go
similarity index 96%
rename from sync/service/planner.go
rename to sync/planner/planner.go
index e3a05ab..27add34 100644
--- a/sync/service/planner.go
+++ b/sync/planner/planner.go
@@ -1,4 +1,4 @@
-package service
+package planner
 
 import (
 	"time"
diff --git a/sync/service/sqlite.go b/sync/planner/sqlite.go
similarity index 99%
rename from sync/service/sqlite.go
rename to sync/planner/sqlite.go
index 8b6c1f2..283be37 100644
--- a/sync/service/sqlite.go
+++ b/sync/planner/sqlite.go
@@ -1,4 +1,4 @@
-package service
+package planner
 
 import (
 	"database/sql"
diff --git a/sync/service/storage.go b/sync/planner/storage.go
similarity index 91%
rename from sync/service/storage.go
rename to sync/planner/storage.go
index 82eae2b..c217c01 100644
--- a/sync/service/storage.go
+++ b/sync/planner/storage.go
@@ -1,4 +1,4 @@
-package service
+package planner
 
 import (
 	"errors"