chat/server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SOLID ish

Browse Source
This commit is contained in:
BENEDEK László 2025-06-05 03:18:26 +02:00
parent de83676794
commit 76755b69bf
14 changed files with 124 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Readme.md
View File

@ -3,9 +3,9 @@
## Goals
- manage sessions
- [ ] login
- [ ] register
- [ ] logout
- [x] login
- [x] register
- [x] logout
- edit users
- [ ] status
- [ ] bio

2
api/user.go
View File

@ -1,6 +1,7 @@
package api
import (
"fmt"
"net/http"
"git.tek.govt.hu/dowerx/chat/server/controller"
@ -14,6 +15,7 @@ func userInfo(c *gin.Context) {
userController, err := controller.MakeUserController()
if err != nil {
fmt.Println(err.Error())
sendError(c, err)
return
}

55
controller/AuthController.go
View File

@ -6,14 +6,16 @@ import (
"git.tek.govt.hu/dowerx/chat/server/config"
"git.tek.govt.hu/dowerx/chat/server/dao"
"git.tek.govt.hu/dowerx/chat/server/dao/postgres"
"git.tek.govt.hu/dowerx/chat/server/dao/valkey"
"git.tek.govt.hu/dowerx/chat/server/model"
"git.tek.govt.hu/dowerx/chat/server/util"
"golang.org/x/crypto/bcrypt"
)
type AuthController struct {
userDAO dao.IUserDAO
sessionDAO dao.ISessionDAO
UserDAO dao.IUserDAO
SessionDAO dao.ISessionDAO
}
const (
@ -23,22 +25,6 @@ const (
TOKEN_LENGTH int = 32
)
func (c *AuthController) init() *util.ChatError {
userDAO, err := dao.MakeUserDAO()
c.userDAO = userDAO
if err != nil {
return err
}
sessionDao, err := dao.MakeSessionDAO()
c.sessionDAO = sessionDao
if err != nil {
return err
}
return nil
}
func (c AuthController) Register(username string, password string, repeatPassword string) *util.ChatError {
if len(username) < MIN_USERNAME_LENGTH {
return &util.ChatError{Message: "", Code: util.USERNAME_TOO_SHORT}
@ -58,7 +44,7 @@ func (c AuthController) Register(username string, password string, repeatPasswor
return util.MakeError(err, util.GENERAL_ERROR)
}
return c.userDAO.Create(model.User{
return c.UserDAO.Create(model.User{
Username: username,
PasswordHash: string(hash),
})
@ -75,7 +61,7 @@ func generateToken(length int) (string, error) {
}
func (c AuthController) Login(username string, password string) (string, *util.ChatError) {
user, err := c.userDAO.Read(model.User{Username: username})
user, err := c.UserDAO.Read(model.User{Username: username})
if err != nil {
return "", err
}
@ -89,12 +75,12 @@ func (c AuthController) Login(username string, password string) (string, *util.C
return "", util.MakeError(err, util.GENERAL_ERROR)
}
err = c.sessionDAO.DeleteAllByID(user.ID)
err = c.SessionDAO.DeleteAllByID(user.ID)
if err != nil {
return "", err
}
err = c.sessionDAO.Set(token, user.ID)
err = c.SessionDAO.Set(token, user.ID)
if err != nil {
return "", err
}
@ -103,9 +89,30 @@ func (c AuthController) Login(username string, password string) (string, *util.C
}
func (c AuthController) Logout(token string) *util.ChatError {
return c.sessionDAO.Delete(token)
return c.SessionDAO.Delete(token)
}
func (c AuthController) Bump(token string) *util.ChatError {
return c.sessionDAO.Bump(token, config.GetConfig().API.TokenLife)
return c.SessionDAO.Bump(token, config.GetConfig().API.TokenLife)
}
func MakeAuthController() (AuthController, *util.ChatError) {
controller := AuthController{}
userDAO := postgres.UserDAOPG{}
err := userDAO.Init()
if err != nil {
return controller, err
}
sessionDAO := valkey.SessionDAOVK{}
err = sessionDAO.Init()
if err != nil {
return controller, err
}
controller.UserDAO = userDAO
controller.SessionDAO = sessionDAO
return controller, nil
}

15
controller/Factory.go
View File

@ -1,15 +0,0 @@
package controller
import "git.tek.govt.hu/dowerx/chat/server/util"
func MakeAuthController() (AuthController, *util.ChatError) {
authController := &AuthController{}
err := authController.init()
return *authController, err
}
func MakeUserController() (UserController, *util.ChatError) {
userController := &UserController{}
err := userController.init()
return *userController, err
}

7
controller/IController.go
View File

@ -1,7 +0,0 @@
package controller
import "git.tek.govt.hu/dowerx/chat/server/util"
type IController interface {
init() *util.ChatError
}

29
controller/UserController.go
View File

@ -2,24 +2,29 @@ package controller
import (
"git.tek.govt.hu/dowerx/chat/server/dao"
"git.tek.govt.hu/dowerx/chat/server/dao/postgres"
"git.tek.govt.hu/dowerx/chat/server/model"
"git.tek.govt.hu/dowerx/chat/server/util"
)
type UserController struct {
userDAO dao.IUserDAO
}
func (c *UserController) init() *util.ChatError {
userDAO, err := dao.MakeUserDAO()
c.userDAO = userDAO
if err != nil {
return err
}
return nil
UserDAO dao.IUserDAO
}
func (c UserController) GetUser(username string) (model.User, *util.ChatError) {
return c.userDAO.Read(model.User{Username: username})
return c.UserDAO.Read(model.User{Username: username})
}
func MakeUserController() (UserController, *util.ChatError) {
controller := UserController{}
userDAO := postgres.UserDAOPG{}
err := userDAO.Init()
if err != nil {
return controller, err
}
controller.UserDAO = userDAO
return controller, nil
}

33
dao/Factory.go
View File

@ -6,14 +6,31 @@ import (
"git.tek.govt.hu/dowerx/chat/server/util"
)
func MakeUserDAO() (IUserDAO, *util.ChatError) {
dao := &postgres.UserDAOPG{}
err := dao.Init()
return dao, err
var userDAO IUserDAO
var sessionDAO ISessionDAO
func GetUserDAO() (IUserDAO, *util.ChatError) {
if !userDAO.Ready() {
dao, err := postgres.MakeUserDAO()
if err != nil {
return userDAO, err
}
func MakeSessionDAO() (ISessionDAO, *util.ChatError) {
dao := &valkey.SessionDAOVK{}
err := dao.Init()
return dao, err
userDAO = dao
}
return userDAO, nil
}
func GetSessionDAO() (ISessionDAO, *util.ChatError) {
if !sessionDAO.Ready() {
dao, err := valkey.MakeUserDAO()
if err != nil {
return sessionDAO, err
}
sessionDAO = dao
}
return sessionDAO, nil
}

4
dao/IDAO.go
View File

@ -1,7 +1,5 @@
package dao
import "git.tek.govt.hu/dowerx/chat/server/util"
type IDAO interface {
Init() *util.ChatError
Ready() bool
}

1
dao/ISessionDAO.go
View File

@ -3,6 +3,7 @@ package dao
import "git.tek.govt.hu/dowerx/chat/server/util"
type ISessionDAO interface {
IDAO
Set(token string, id int) *util.ChatError
Get(token string) (int, *util.ChatError)
Delete(token string) *util.ChatError

1
dao/IUserDAO.go
View File

@ -6,6 +6,7 @@ import (
)
type IUserDAO interface {
IDAO
Create(user model.User) *util.ChatError
Read(user model.User) (model.User, *util.ChatError)
List() ([]model.User, *util.ChatError)

5
dao/postgres/Connection.go
View File

@ -2,6 +2,7 @@ package postgres
import (
"fmt"
"sync"
"git.tek.govt.hu/dowerx/chat/server/config"
"git.tek.govt.hu/dowerx/chat/server/util"
@ -10,16 +11,20 @@ import (
)
var db *sqlx.DB
var mu sync.Mutex
func getDatabase() (*sqlx.DB, *util.ChatError) {
mu.Lock()
if db == nil {
cfg := config.GetConfig()
newDB, err := sqlx.Connect("postgres", fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable", cfg.Database.Host, cfg.Database.Port, cfg.Database.User, cfg.Database.Password, cfg.Database.DBname))
if err != nil {
mu.Unlock()
return nil, util.MakeError(err, util.DATABASE_CONNECTION_FAULT)
}
db = newDB
}
mu.Unlock()
return db, nil
}

17
dao/postgres/UserDAO.go
View File

@ -25,6 +25,7 @@ func (d UserDAOPG) Read(user model.User) (model.User, *util.ChatError) {
} else {
rows, err = d.db.NamedQuery(`select * from "user" where "username" = :username`, &user)
}
defer rows.Close()
if err != nil {
return user, util.MakeError(err, util.DATABASE_QUERY_FAULT)
@ -44,6 +45,7 @@ func (d UserDAOPG) List() ([]model.User, *util.ChatError) {
if err != nil {
return nil, util.MakeError(err, util.DATABASE_QUERY_FAULT)
}
defer rows.Close()
users := make([]model.User, 0)
@ -78,3 +80,18 @@ func (d UserDAOPG) Delete(user model.User) *util.ChatError {
return util.MakeError(err, util.DATABASE_QUERY_FAULT)
}
func (d UserDAOPG) Ready() bool {
return d.db != nil
}
func MakeUserDAO() (UserDAOPG, *util.ChatError) {
dao := UserDAOPG{}
conn, err := getDatabase()
if err != nil {
return dao, err
}
dao.db = conn
return dao, nil
}

6
dao/valkey/Connection.go
View File

@ -1,19 +1,25 @@
package valkey
import (
"sync"
"git.tek.govt.hu/dowerx/chat/server/config"
"git.tek.govt.hu/dowerx/chat/server/util"
"github.com/valkey-io/valkey-go"
)
var vk valkey.Client = nil
var mu sync.Mutex
func getClient() (*valkey.Client, *util.ChatError) {
mu.Lock()
if vk == nil {
client, err := valkey.NewClient(config.GetConfig().Valkey)
vk = client
mu.Unlock()
return &vk, util.MakeError(err, util.DATABASE_CONNECTION_FAULT)
}
mu.Unlock()
return &vk, nil
}

15
dao/valkey/SessionDAO.go
View File

@ -88,3 +88,18 @@ func (d SessionDAOVK) Bump(token string, time int) *util.ChatError {
cmd := (*d.vk).B().Expire().Key(SESSION_PREFIX + token).Seconds(int64(time)).Build()
return util.MakeError((*d.vk).Do(context.Background(), cmd).Error(), util.DATABASE_QUERY_FAULT)
}
func (d SessionDAOVK) Ready() bool {
return d.vk != nil
}
func MakeUserDAO() (SessionDAOVK, *util.ChatError) {
dao := SessionDAOVK{}
conn, err := getClient()
if err != nil {
return dao, err
}
dao.vk = conn
return dao, nil
}