feat: delete user

GDGVIT · Feb 4, 2024 · 7d1c804 · 7d1c804
1 parent ef3d9bb
commit 7d1c804
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/vitty-backend-api/api/v2/userHandler.go b/vitty-backend-api/api/v2/userHandler.go
@@ -76,8 +76,9 @@ func deleteUser(c *fiber.Ctx) error {
 			"detail": "You are not authorized to delete this user",
 		})
 	}
+	deleteUser := utils.GetUserByUsername(c.Params("username"))
 
-	database.DB.Delete(&request_user)
+	database.DB.Delete(&deleteUser)
 	return c.Status(fiber.StatusOK).JSON(fiber.Map{
 		"detail": "User deleted successfully",
 	})

diff --git a/vitty-backend-api/internal/models/friends.go b/vitty-backend-api/internal/models/friends.go
@@ -8,8 +8,8 @@ import (
 type FriendRequest struct {
 	FromUsername string `gorm:"primaryKey"`
 	ToUsername   string `gorm:"primaryKey"`
-	From         User   `gorm:"foreignKey:FromUsername;references:Username;constraint:OnDelete:CASCADE"`
-	To           User   `gorm:"foreignKey:ToUsername;references:Username;constraint:OnDelete:CASCADE"`
+	From         User   `gorm:"constraint:OnDelete:CASCADE;foreignKey:FromUsername;references:Username"`
+	To           User   `gorm:"constraint:OnDelete:CASCADE;foreignKey:ToUsername;references:Username"`
 }
 
 func (fr *FriendRequest) Accept() {

diff --git a/vitty-backend-api/internal/models/timetable.go b/vitty-backend-api/internal/models/timetable.go
@@ -18,7 +18,7 @@ type Slot struct {
 }
 
 type Timetable struct {
-	User         User   `gorm:"foreignKey:UserUsername;references:Username;constraint:OnDelete:CASCADE"`
+	User         User   `gorm:"constraint:OnDelete:CASCADE;foreignKey:UserUsername;references:Username"`
 	UserUsername string `gorm:"primaryKey"`
 	Slots        []Slot `gorm:"serializer:json"`
 }

diff --git a/vitty-backend-api/internal/models/users.go b/vitty-backend-api/internal/models/users.go
@@ -15,7 +15,7 @@ type User struct {
 	Email        string  `gorm:"unique,not null"`
 	Role         string  `gorm:"default:normal"`
 	Picture      string  `gorm:"not null"`
-	Friends      []*User `gorm:"many2many:user_friends;foreignKey:Username;joinForeignKey:UserUsername;References:Username;joinReferences:FriendUsername"`
+	Friends      []*User `gorm:"constraint:OnDelete:CASCADE;many2many:user_friends;foreignKey:Username;joinForeignKey:UserUsername;References:Username;joinReferences:FriendUsername"`
 	FirebaseUuid string  `gorm:"unique"`
 }