add relational table request

This commit is contained in:
Adrian Zürcher
2025-11-27 07:53:22 +01:00
parent 8156fea488
commit 21daaf1819
6 changed files with 22 additions and 21 deletions

View File

@@ -29,7 +29,7 @@ func (aH *AccessHandler) AddDefaultUser() (err error) {
}
// Check if a user with this email already exists
if aH.dbHandler.Exists(&models.User{}, "", "email", user.Email, false) {
if aH.dbHandler.Exists(&models.User{}, "email", user.Email, false) {
aH.logger.Debug("AddDefaultUser", "user email "+user.Email+" exists already")
// Found a user → skip create
return nil
@@ -42,7 +42,7 @@ func (aH *AccessHandler) AddDefaultUser() (err error) {
}
role := &models.Role{}
if err := aH.dbHandler.GetByKey(role, "", "role", "admin", false); err != nil {
if err := aH.dbHandler.GetByKey(role, "role", "admin", false); err != nil {
return err
}
return aH.dbHandler.AddRelation(user, role, "Role")
@@ -64,7 +64,7 @@ func (aH *AccessHandler) AddUser(c *gin.Context) {
}
// Check if a user with this email already exists
if aH.dbHandler.Exists(&models.User{}, "", "email", user.Email, false) {
if aH.dbHandler.Exists(&models.User{}, "email", user.Email, false) {
// Found a user → skip create
aH.logger.Error("AddUser", "user with email "+user.Email+" already exists")
c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse(fmt.Sprintf("user with email %s already exists", user.Email)))
@@ -91,13 +91,13 @@ func (aH *AccessHandler) AddUser(c *gin.Context) {
aH.logger.Debug("AddUser", "add new user "+user.Name+" with role "+user.Role.Role)
if user.Role.Id != 0 {
if err := aH.dbHandler.GetById(&user.Role, "", user.Role.Id); err != nil {
if err := aH.dbHandler.GetById(&user.Role, user.Role.Id); err != nil {
aH.logger.Error("AddUser", err)
c.JSON(http.StatusInternalServerError, nil)
return
}
} else {
if err := aH.dbHandler.GetByKey(&user.Role, "", "role", user.Role.Role, false); err != nil {
if err := aH.dbHandler.GetByKey(&user.Role, "role", user.Role.Role, false); err != nil {
aH.logger.Error("AddUser", err)
c.JSON(http.StatusInternalServerError, nil)
return
@@ -128,7 +128,7 @@ func (aH *AccessHandler) ChangePassword(c *gin.Context) {
// get user to check ChangePassword
var dbRecord models.User
err = aH.dbHandler.GetById(&dbRecord, "Role", user.Id)
err = aH.dbHandler.GetById(&dbRecord, user.Id, "Role")
if err != nil {
aH.logger.Error("ChangePassword", err)
c.JSON(http.StatusInternalServerError, nil)
@@ -154,7 +154,7 @@ func (aH *AccessHandler) ChangePassword(c *gin.Context) {
aH.logger.Debug("ChangePassword", "change user "+user.Name+" password")
// Update user
aH.dbHandler.UpdateValuesById(&user, "Role", user.Id)
aH.dbHandler.UpdateValuesById(&user, user.Id, "Role")
c.JSON(http.StatusOK, gin.H{
"message": fmt.Sprintf("password of user '%s' changed", user.Name),
@@ -178,7 +178,7 @@ func (aH *AccessHandler) GetUser(c *gin.Context) {
}
var users []models.User
err = aH.dbHandler.GetById(&users, "Role", uint(i))
err = aH.dbHandler.GetById(&users, uint(i), "Role")
if err != nil {
aH.logger.Error("GetUser", err)
c.JSON(http.StatusInternalServerError, nil)
@@ -194,7 +194,7 @@ func (aH *AccessHandler) UpdateUser(c *gin.Context) {
c.JSON(http.StatusInternalServerError, nil)
return
}
err := aH.dbHandler.UpdateValuesById(&user, "Role", user.Id)
err := aH.dbHandler.UpdateValuesById(&user, user.Id, "Role")
if err != nil {
aH.logger.Error("UpdateUser", err)
c.JSON(http.StatusInternalServerError, nil)