code reorganisation

.gitignore

@@ -23,3 +23,9 @@ go.work.sum
 
 # env file
 .env
+
+.run
+
+# temporary
+coworker/
+webapp/

main.go

@@ -1,15 +1,15 @@
 package main
 
 import (
-	"backend/logger"
+	"backend/src/args_parser"
-	"backend/src/handlers"
+	"backend/src/config"
-	"backend/src/middleware"
+	"backend/src/core/models"
-	"backend/src/models"
+	"backend/src/core/repos"
-	"backend/src/repo"
+	"backend/src/core/services"
-	"backend/src/services"
+	"backend/src/core/utils"
-	"backend/src/utils"
+	"backend/src/logger"
-	"backend/utils/args_parser"
+	"backend/src/server/handlers"
-	"backend/utils/config"
+	"backend/src/server/middleware"
 	"crypto/rsa"
 	"crypto/x509"
 	"database/sql"
@@ -75,10 +75,10 @@ func main() {
 
 	jwtUtil := utils.NewJwtUtil(key)
 	passwordUtil := utils.NewPasswordUtil()
-	userRepo := repo.NewUserRepo(sqlDb)
+	userRepo := repos.NewUserRepo(sqlDb)
-	userCache := repo.NewCacheInmem[string, models.UserDTO](60 * 60)
+	userCache := repos.NewCacheInmem[string, models.UserDTO](60 * 60)
-	emailRepo := repo.NewEmailRepo()
+	emailRepo := repos.NewEmailRepo()
-	actionTokenRepo := repo.NewActionTokenRepo(sqlDb)
+	actionTokenRepo := repos.NewActionTokenRepo(sqlDb)
 
 	userService := services.NewUserService(
 		services.UserServiceDeps{
@@ -92,7 +92,7 @@ func main() {
 	)
 	linkService := services.NewShortlinkSevice(
 		services.NewShortlinkServiceParams{
-			Cache: repo.NewCacheInmem[string, string](7 * 24 * 60 * 60),
+			Cache: repos.NewCacheInmem[string, string](7 * 24 * 60 * 60),
 		},
 	)
 

src/core/repos/action_token.go

@@ -1,7 +1,7 @@
-package repo
+package repos
 
 import (
-	"backend/src/models"
+	"backend/src/core/models"
 	"context"
 	"database/sql"
 )

src/core/repos/cache_inmem.go

@@ -1,4 +1,4 @@
-package repo
+package repos
 
 import (
 	"sync"

src/core/repos/email_repo.go

@@ -1,4 +1,4 @@
-package repo
+package repos
 
 import (
 	"strings"

src/core/repos/user_repo.go

@@ -1,7 +1,7 @@
-package repo
+package repos
 
 import (
-	"backend/src/models"
+	"backend/src/core/models"
 	"context"
 	"database/sql"
 	"errors"

src/core/services/shortlink_service.go

@@ -1,8 +1,8 @@
 package services
 
 import (
-	"backend/src/repo"
+	"backend/src/core/repos"
-	"backend/src/utils"
+	"backend/src/core/utils"
 	"fmt"
 )
 
@@ -13,7 +13,7 @@ type ShortlinkService interface {
 
 type NewShortlinkServiceParams struct {
 	Endpoint string
-	Cache    repo.Cache[string, string]
+	Cache    repos.Cache[string, string]
 }
 
 func NewShortlinkSevice(params NewShortlinkServiceParams) ShortlinkService {
@@ -25,7 +25,7 @@ func NewShortlinkSevice(params NewShortlinkServiceParams) ShortlinkService {
 
 type shortlinkService struct {
 	randomUtil utils.RandomUtil
-	cache      repo.Cache[string, string]
+	cache      repos.Cache[string, string]
 }
 
 func (s *shortlinkService) CreateLink(in string) (string, error) {

src/core/services/user_service.go

@@ -1,9 +1,9 @@
 package services
 
 import (
-	"backend/src/models"
+	"backend/src/core/models"
-	"backend/src/repo"
+	"backend/src/core/repos"
-	"backend/src/utils"
+	"backend/src/core/utils"
 	"context"
 	"fmt"
 
@@ -32,10 +32,10 @@ func NewUserService(deps UserServiceDeps) UserService {
 type UserServiceDeps struct {
 	Jwt             utils.JwtUtil
 	Password        utils.PasswordUtil
-	UserRepo        repo.UserRepo
+	UserRepo        repos.UserRepo
-	UserCache       repo.Cache[string, models.UserDTO]
+	UserCache       repos.Cache[string, models.UserDTO]
-	EmailRepo       repo.EmailRepo
+	EmailRepo       repos.EmailRepo
-	ActionTokenRepo repo.ActionTokenRepo
+	ActionTokenRepo repos.ActionTokenRepo
 }
 
 type userService struct {

src/leader_elector/elector.go

@@ -0,0 +1,25 @@
+package leader_elector
+
+import (
+	"context"
+	"database/sql"
+)
+
+func Lock(ctx context.Context, db *sql.DB, lockName, id string) error {
+	query := `
+	update locks (id)
+		set id = $1
+		where name == lockName and timestamp < $1 returning id
+	on conflict
+		insert into locks(id, name) values($1, $2);`
+
+	row := db.QueryRowContext(ctx, query, id)
+
+	result := ""
+	err := row.Scan(&result)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

src/server/handlers/shortlink_handlers.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"backend/src/services"
+	"backend/src/core/services"
 	"encoding/json"
 	"fmt"
 	"net/url"

src/server/handlers/user_create_handler.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"backend/src/services"
+	"backend/src/core/services"
 	"encoding/json"
 
 	"github.com/gin-gonic/gin"

src/server/handlers/user_login_handler.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"backend/src/services"
+	"backend/src/core/services"
 	"encoding/json"
 
 	"github.com/gin-gonic/gin"

src/server/middleware/auth.go

@@ -1,7 +1,7 @@
 package middleware
 
 import (
-	"backend/src/services"
+	"backend/src/core/services"
 	"fmt"
 
 	"github.com/gin-gonic/gin"

src/server/middleware/request_log.go

@@ -1,7 +1,7 @@
 package middleware
 
 import (
-	"backend/logger"
+	"backend/src/logger"
 	"time"
 
 	"github.com/gin-gonic/gin"