kalipso/zineshop
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

Abstract db handling into repositories

Browse Source
This commit is contained in:
kalipso
2025-01-05 22:22:00 +01:00
parent 2eadad9135
commit 4e48e87f6c
5 changed files with 303 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
controllers/roomController.go
View File

@@ -6,9 +6,9 @@ import (
"strconv"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"example.com/gin/test/models"
"example.com/gin/test/repositories"
)
type CRUDController interface {
@@ -25,21 +25,16 @@ type RoomController interface {
AddUser(*gin.Context)
}
type roomController struct {
DB *gorm.DB
}
type roomController struct {}
func NewRoomController(db *gorm.DB) RoomController {
return &roomController{
DB: db,
}
func NewRoomController() RoomController {
return &roomController{}
}
func (rc *roomController) GetAll(c *gin.Context) {
var rooms []models.Room
result := rc.DB.Find(&rooms)
rooms, err := repositories.Rooms.GetAll()
if result.Error != nil {
if err != nil {
ReplyError(c, fmt.Errorf("Could not query rooms"))
return
}
@@ -48,18 +43,10 @@ func (rc *roomController) GetAll(c *gin.Context) {
}
func (rc *roomController) GetById(c *gin.Context) {
roomId, err := strconv.Atoi(c.Param("id"))
room, err := repositories.Rooms.GetById(c.Param("id"))
if err != nil {
ReplyError(c, fmt.Errorf("Room with Id '%s' does not exist", c.Param("id")))
return
}
var room models.Room
result := rc.DB.First(&room, uint(roomId))
if result.Error != nil {
ReplyError(c, fmt.Errorf("Could not query room: %v", result.Error))
ReplyError(c, fmt.Errorf("Could not query room: %v", err))
return
}
@@ -80,9 +67,9 @@ func (rc *roomController) Create(c *gin.Context) {
ReplyError(c, err)
}
result := rc.DB.Create(&room)
if result.Error != nil {
ReplyError(c, fmt.Errorf("Room creation failed: %s", result.Error))
_, err = repositories.Rooms.Create(room)
if err != nil {
ReplyError(c, fmt.Errorf("Room creation failed: %s", err))
return
}
@@ -114,9 +101,10 @@ func (rc *roomController) Update(c *gin.Context) {
}
room.ID = uint(roomId)
result := rc.DB.Save(&room)
if result.Error != nil {
ReplyError(c, fmt.Errorf("Room creation failed: %s", result.Error))
_, err = repositories.Rooms.Update(room)
if err != nil {
ReplyError(c, fmt.Errorf("Room creation failed: %s", err))
return
}
@@ -124,17 +112,10 @@ func (rc *roomController) Update(c *gin.Context) {
}
func (rc *roomController) Delete(c *gin.Context) {
roomId, err := strconv.Atoi(c.Param("id"))
err := repositories.Rooms.DeleteById(c.Param("id"))
if err != nil {
ReplyError(c, fmt.Errorf("Room with Id '%s' does not exist", c.Param("id")))
return
}
result := rc.DB.Delete(&models.Room{}, roomId)
if result.Error != nil {
ReplyError(c, fmt.Errorf("Room deletion failed: %s", result.Error))
ReplyError(c, fmt.Errorf("Room deletion failed: %s", err))
return
}
@@ -144,23 +125,12 @@ func (rc *roomController) Delete(c *gin.Context) {
func (rc *roomController) GetUsers(c *gin.Context) {
//only allow room admin
roomId, err := strconv.Atoi(c.Param("id"))
users, err := repositories.Rooms.GetRoomUsersById(c.Param("id"))
if err != nil {
ReplyError(c, fmt.Errorf("Room with Id '%s' does not exist", c.Param("id")))
ReplyError(c, fmt.Errorf("Could not get users for room '%s'", c.Param("id")))
return
}
var room models.Room
result := rc.DB.First(&room, uint(roomId))
if result.Error != nil {
ReplyError(c, fmt.Errorf("Could not query room: %v", result.Error))
return
}
var users []models.User
rc.DB.Model(&room).Association("Users").Find(&users)
var emails []string
for _, user := range users {
@@ -188,10 +158,9 @@ func (rc *roomController) AddUser(c *gin.Context) {
}
//lookup requested user
var user models.User
result := rc.DB.First(&user, "email = ?", body.Email)
user, err := repositories.Users.GetByEmail(body.Email)
if result.Error != nil {
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{
"error": "Invalid user",
})
@@ -199,22 +168,13 @@ func (rc *roomController) AddUser(c *gin.Context) {
return
}
roomId, err := strconv.Atoi(c.Param("id"))
err = repositories.Rooms.AddRoomUserById(c.Param("id"), user)
if err != nil {
ReplyError(c, fmt.Errorf("Room with Id '%s' does not exist", c.Param("id")))
ReplyError(c, fmt.Errorf("Could not add user to room."))
return
}
var room models.Room
result = rc.DB.First(&room, uint(roomId))
if result.Error != nil {
ReplyError(c, fmt.Errorf("Could not query room: %v", result.Error))
return
}
rc.DB.Model(&room).Association("Users").Append(&user)
ReplyOK(c, "Added User to Room")
}

68
controllers/userController.go
View File

@@ -9,20 +9,16 @@ import(
"github.com/golang-jwt/jwt/v5"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"example.com/gin/test/models"
"example.com/gin/test/repositories"
)
type UserController struct {
DB *gorm.DB
}
type UserController struct {}
func NewUserController(db *gorm.DB) UserController {
return UserController{
DB: db,
}
func NewUserController() UserController {
return UserController{}
}
@@ -57,10 +53,10 @@ func (uc *UserController) Register(c *gin.Context) {
//create user
user := models.User{Name: body.Name, Email: body.Email, Password: string(hash)}
result := uc.DB.Create(&user)
_, err = repositories.Users.Create(user)
if result.Error != nil {
fmt.Println("Error: ", result.Error)
if err != nil {
fmt.Println("Error: ", err)
c.JSON(http.StatusBadRequest, gin.H{
"error": "Failed to create user",
})
@@ -92,10 +88,9 @@ func (uc *UserController) Login(c *gin.Context) {
}
//lookup requested user
var user models.User
result := uc.DB.First(&user, "email = ?", body.Email)
user, err := repositories.Users.GetByEmail(body.Email)
if result.Error != nil {
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{
"error": "Invalid email or password",
})
@@ -151,3 +146,48 @@ func (uc *UserController) Validate(c *gin.Context) {
})
}
}
func (rc *UserController) LoginView(c *gin.Context) {
rooms, _ := repositories.Rooms.GetAll()
data := gin.H{
"title": "Room Page",
"rooms": rooms,
}
c.HTML(http.StatusOK, "login.html", data)
}
func (rc *UserController) RegisterView(c *gin.Context) {
rooms, _ := repositories.Rooms.GetAll()
data := gin.H{
"title": "Room Page",
"rooms": rooms,
}
c.HTML(http.StatusOK, "register.html", data)
}
func (rc *UserController) ResetView(c *gin.Context) {
rooms, _ := repositories.Rooms.GetAll()
data := gin.H{
"title": "Room Page",
"rooms": rooms,
}
c.HTML(http.StatusOK, "passwordreset.html", data)
}
func (rc *UserController) MainView(c *gin.Context) {
rooms, _ := repositories.Rooms.GetAll()
data := gin.H{
"title": "Room Page",
"rooms": rooms,
}
c.HTML(http.StatusOK, "index.html", data)
}