From 49952c62ef2c38f38ac38febdca78363cce4aae3 Mon Sep 17 00:00:00 2001
From: Masahiko AMANO <hiko-19@ya.ru>
Date: Sat, 5 Jul 2025 14:50:44 +0300
Subject: [PATCH] refactor(backend): change backend file structure

---
 .../models.go => internal/domain/domain.go}      |  2 +-
 .../{db => internal/storage/postgres}/files.go   | 16 ++++++++--------
 .../db.go => internal/storage/postgres/store.go} |  2 +-
 .../{db => internal/storage/postgres}/utils.go   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename backend/{models/models.go => internal/domain/domain.go} (94%)
 rename backend/{db => internal/storage/postgres}/files.go (96%)
 rename backend/{db/db.go => internal/storage/postgres/store.go} (94%)
 rename backend/{db => internal/storage/postgres}/utils.go (98%)

diff --git a/backend/models/models.go b/backend/internal/domain/domain.go
similarity index 94%
rename from backend/models/models.go
rename to backend/internal/domain/domain.go
index e64a808..76fa57c 100644
--- a/backend/models/models.go
+++ b/backend/internal/domain/domain.go
@@ -1,4 +1,4 @@
-package models
+package domain
 
 import (
 	"encoding/json"
diff --git a/backend/db/files.go b/backend/internal/storage/postgres/files.go
similarity index 96%
rename from backend/db/files.go
rename to backend/internal/storage/postgres/files.go
index 413fd3d..02338c5 100644
--- a/backend/db/files.go
+++ b/backend/internal/storage/postgres/files.go
@@ -1,4 +1,4 @@
-package db
+package postgres
 
 import (
 	"context"
@@ -7,9 +7,9 @@ import (
 	"net/http"
 	"time"
 
-	"tanabata/models"
-
 	"github.com/jackc/pgx/v5"
+
+	"tanabata/internal/domain"
 )
 
 // Check if user can view file
@@ -35,7 +35,7 @@ func FileGetAccess(user_id int, file_id string) (canView, canEdit bool, err erro
 }
 
 // Get a set of files
-func FileGetSlice(user_id int, filter, sort string, limit, offset int) (files models.Slice[models.FileItem], statusCode int, err error) {
+func FileGetSlice(user_id int, filter, sort string, limit, offset int) (files domain.Slice[domain.FileItem], statusCode int, err error) {
 	filterCond, statusCode, err := filterToSQL(filter)
 	if err != nil {
 		return
@@ -78,7 +78,7 @@ func FileGetSlice(user_id int, filter, sort string, limit, offset int) (files mo
 		defer rows.Close()
 		count := 0
 		for rows.Next() {
-			var file models.FileItem
+			var file domain.FileItem
 			err = rows.Scan(&file.ID, &file.Name, &file.MIME.Name, &file.MIME.Extension, &file.CreatedAt, &file.Creator.Name, &file.Creator.IsAdmin)
 			if err != nil {
 				statusCode = http.StatusInternalServerError
@@ -109,7 +109,7 @@ func FileGetSlice(user_id int, filter, sort string, limit, offset int) (files mo
 }
 
 // Get file
-func FileGet(user_id int, file_id string) (file models.FileFull, statusCode int, err error) {
+func FileGet(user_id int, file_id string) (file domain.FileFull, statusCode int, err error) {
 	ctx := context.Background()
 	row := connPool.QueryRow(ctx, `
 		SELECT
@@ -149,7 +149,7 @@ func FileGet(user_id int, file_id string) (file models.FileFull, statusCode int,
 	}
 	defer rows.Close()
 	for rows.Next() {
-		var tag models.TagCore
+		var tag domain.TagCore
 		err = rows.Scan(&tag.ID, &tag.Name, &tag.Color)
 		if err != nil {
 			statusCode = http.StatusInternalServerError
@@ -167,7 +167,7 @@ func FileGet(user_id int, file_id string) (file models.FileFull, statusCode int,
 }
 
 // Add file
-func FileAdd(user_id int, name, mime string, datetime time.Time, notes string, metadata json.RawMessage) (file models.FileCore, statusCode int, err error) {
+func FileAdd(user_id int, name, mime string, datetime time.Time, notes string, metadata json.RawMessage) (file domain.FileCore, statusCode int, err error) {
 	ctx := context.Background()
 	var mime_id int
 	var extension string
diff --git a/backend/db/db.go b/backend/internal/storage/postgres/store.go
similarity index 94%
rename from backend/db/db.go
rename to backend/internal/storage/postgres/store.go
index 722947f..56723f3 100644
--- a/backend/db/db.go
+++ b/backend/internal/storage/postgres/store.go
@@ -1,4 +1,4 @@
-package db
+package postgres
 
 import (
 	"context"
diff --git a/backend/db/utils.go b/backend/internal/storage/postgres/utils.go
similarity index 98%
rename from backend/db/utils.go
rename to backend/internal/storage/postgres/utils.go
index 2274099..f190f5a 100644
--- a/backend/db/utils.go
+++ b/backend/internal/storage/postgres/utils.go
@@ -1,4 +1,4 @@
-package db
+package postgres
 
 import (
 	"fmt"