Refactor everything

3 files changed, 48 insertions, 70 deletions

diff --git a/repository/appRepository.go b/repo/appRepo.go
index 9e57fb7..6338c4a 100644
--- a/repository/appRepository.go
+++ b/repo/appRepo.go
@@ -1,4 +1,4 @@
-package repository
+package repo
 
 import (
 	"encoding/json"
@@ -7,17 +7,17 @@ import (
 	"bloat/model"
 )
 
-type appRepository struct {
+type appRepo struct {
 	db *kv.Database
 }
 
-func NewAppRepository(db *kv.Database) *appRepository {
-	return &appRepository{
+func NewAppRepo(db *kv.Database) *appRepo {
+	return &appRepo{
 		db: db,
 	}
 }
 
-func (repo *appRepository) Add(a model.App) (err error) {
+func (repo *appRepo) Add(a model.App) (err error) {
 	data, err := json.Marshal(a)
 	if err != nil {
 		return
@@ -26,7 +26,7 @@ func (repo *appRepository) Add(a model.App) (err error) {
 	return
 }
 
-func (repo *appRepository) Get(instanceDomain string) (a model.App, err error) {
+func (repo *appRepo) Get(instanceDomain string) (a model.App, err error) {
 	data, err := repo.db.Get(instanceDomain)
 	if err != nil {
 		err = model.ErrAppNotFound
diff --git a/repo/sessionRepo.go b/repo/sessionRepo.go
new file mode 100644
index 0000000..ce923b1
--- /dev/null
+++ b/repo/sessionRepo.go
@@ -0,0 +1,42 @@
+package repo
+
+import (
+	"encoding/json"
+
+	"bloat/kv"
+	"bloat/model"
+)
+
+type sessionRepo struct {
+	db *kv.Database
+}
+
+func NewSessionRepo(db *kv.Database) *sessionRepo {
+	return &sessionRepo{
+		db: db,
+	}
+}
+
+func (repo *sessionRepo) Add(s model.Session) (err error) {
+	data, err := json.Marshal(s)
+	if err != nil {
+		return
+	}
+	err = repo.db.Set(s.ID, data)
+	return
+}
+
+func (repo *sessionRepo) Get(id string) (s model.Session, err error) {
+	data, err := repo.db.Get(id)
+	if err != nil {
+		err = model.ErrSessionNotFound
+		return
+	}
+
+	err = json.Unmarshal(data, &s)
+	if err != nil {
+		return
+	}
+
+	return
+}
diff --git a/repository/sessionRepository.go b/repository/sessionRepository.go
deleted file mode 100644
index cb19f68..0000000
--- a/repository/sessionRepository.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package repository
-
-import (
-	"encoding/json"
-
-	"bloat/kv"
-	"bloat/model"
-)
-
-type sessionRepository struct {
-	db *kv.Database
-}
-
-func NewSessionRepository(db *kv.Database) *sessionRepository {
-	return &sessionRepository{
-		db: db,
-	}
-}
-
-func (repo *sessionRepository) Add(s model.Session) (err error) {
-	data, err := json.Marshal(s)
-	if err != nil {
-		return
-	}
-	err = repo.db.Set(s.ID, data)
-	return
-}
-
-func (repo *sessionRepository) Update(id string, accessToken string) (err error) {
-	data, err := repo.db.Get(id)
-	if err != nil {
-		return
-	}
-
-	var s model.Session
-	err = json.Unmarshal(data, &s)
-	if err != nil {
-		return
-	}
-
-	s.AccessToken = accessToken
-
-	data, err = json.Marshal(s)
-	if err != nil {
-		return
-	}
-
-	return repo.db.Set(id, data)
-}
-
-func (repo *sessionRepository) Get(id string) (s model.Session, err error) {
-	data, err := repo.db.Get(id)
-	if err != nil {
-		err = model.ErrSessionNotFound
-		return
-	}
-
-	err = json.Unmarshal(data, &s)
-	if err != nil {
-		return
-	}
-
-	return
-}