Merge pull request #23 from orion-ai-project/dev

fix: options database to key-based data structure

controllers/auth_controller.go

@@ -55,7 +55,6 @@ func (c *authController) Register(ctx *gin.Context) {
 
 	ctx.SetSameSite(http.SameSiteNoneMode)
 	ctx.SetCookie("RefreshToken", resp.RefreshToken, 3600*24*7, "/", "", true, true)
-
 	utils.SendResponse[dto.AuthResponse, any](ctx, nil, *resp, nil)
 }
 

models/entity/constant.go

@@ -3,7 +3,7 @@ package models
 const (
 	CONNECTION_SUCCESS_MESSAGE   = "Connection initialized. Please scan the QR code in your terminal."
 	CONNECTION_INIT_SUCCESS      = "Connection process initiated successfully"
-	QR_SCAN_INSTRUCTION          = "Check terminal for QR code scanning"
+	QR_SCAN_INSTRUCTION          = "Check Screen for QR code scanning"
 	POSTGRES_DIALECT             = "postgres"
 	WHATSAPP_STATUS_CONNECTED    = "connected"
 	WHATSAPP_STATUS_DISCONNECTED = "disconnected"

models/entity/entity.go

@@ -7,30 +7,19 @@ import (
 	"gorm.io/gorm"
 )
 
-type WhatsAppAccount struct {
+type User struct {
 	ID          uuid.UUID      `gorm:"primaryKey;type:uuid;default:gen_random_uuid()" json:"id"`
-	AccountName string         `gorm:"size:100;not null" json:"account_name"`
-	JID         string         `gorm:"column:jid;size:255;uniqueIndex" json:"jid"`
+	Username    string         `gorm:"size:100;uniqueIndex;not null" json:"username"`
+	Password    string         `gorm:"not null" json:"-"`
+	Role        string         `gorm:"default:'user';not null" json:"role"`
+	AccountName string         `gorm:"size:100;default:'Default Device'" json:"account_name"`
+	JID         string         `gorm:"column:jid;size:255" json:"jid"`
 	IsActive    bool           `gorm:"default:false" json:"is_active"`
 	CreatedAt   time.Time      `json:"created_at"`
 	UpdatedAt   time.Time      `json:"updated_at"`
 	DeletedAt   gorm.DeletedAt `gorm:"index" json:"deleted_at"`
 }
 
-func (WhatsAppAccount) TableName() string {
-	return "whatsapp_accounts"
-}
-
-type User struct {
-	ID        uuid.UUID      `gorm:"primaryKey;type:uuid;default:gen_random_uuid()" json:"id"`
-	Username  string         `gorm:"size:100;uniqueIndex;not null" json:"username"`
-	Password  string         `gorm:"not null" json:"-"`
-	Role      string         `gorm:"default:'user';not null" json:"role"`
-	CreatedAt time.Time      `json:"created_at"`
-	UpdatedAt time.Time      `json:"updated_at"`
-	DeletedAt gorm.DeletedAt `gorm:"index" json:"deleted_at"`
-}
-
 func (User) TableName() string {
 	return "users"
 }
@@ -47,11 +36,11 @@ func (RefreshToken) TableName() string {
 	return "refresh_tokens"
 }
 
-type Settings struct {
-	ID                  uint `gorm:"primaryKey" json:"id"`
-	RegistrationEnabled bool `gorm:"default:true" json:"registration_enabled"`
+type Setting struct {
+	Key   string `gorm:"primaryKey;size:255" json:"key"`
+	Value string `gorm:"type:text" json:"value"`
 }
 
-func (Settings) TableName() string {
+func (Setting) TableName() string {
 	return "settings"
 }

provider/provider.go

@@ -33,10 +33,9 @@ func NewAppProvider() AppProvider {
 
 	// Auto-Migrate Entities
 	_ = configProvider.ProvideDatabaseConfig().AutoMigrateAll(
-		&entity.WhatsAppAccount{},
 		&entity.User{},
 		&entity.RefreshToken{},
-		&entity.Settings{},
+		&entity.Setting{},
 	)
 
 	return &appProvider{

repositories/auth_repository.go

@@ -18,7 +18,7 @@ type AuthRepository interface {
 	RevokeAllUserRefreshTokens(userID uuid.UUID) error
 	UpdateUser(user *entity.User) error
 	DeleteUser(id uuid.UUID) error
-	GetSettings() (*entity.Settings, error)
+	GetSetting(key string) (string, error)
 	SetRegistrationEnabled(enabled bool) error
 	HasValidRefreshToken(userID uuid.UUID) (bool, error)
 }
@@ -85,23 +85,40 @@ func (r *authRepository) DeleteUser(id uuid.UUID) error {
 	return r.db.Delete(&entity.User{}, id).Error
 }
 
-func (r *authRepository) GetSettings() (*entity.Settings, error) {
-	var settings entity.Settings
-	if err := r.db.First(&settings).Error; err != nil {
-		settings = entity.Settings{ID: 1, RegistrationEnabled: true}
-		r.db.Create(&settings)
+func (r *authRepository) GetSetting(key string) (string, error) {
+	var setting entity.Setting
+	if err := r.db.Where("key = ?", key).First(&setting).Error; err != nil {
+		if err == gorm.ErrRecordNotFound {
+			// Return default "true" for registration_enabled if not found, to match original default behavior?
+			// The original default was true in struct tag.
+			if key == "registration_enabled" {
+				return "true", nil
+			}
+			return "", nil
+		}
+		return "", err
 	}
-	return &settings, nil
+	return setting.Value, nil
 }
 
 func (r *authRepository) SetRegistrationEnabled(enabled bool) error {
-	var settings entity.Settings
-	if err := r.db.First(&settings).Error; err != nil {
-		settings = entity.Settings{ID: 1, RegistrationEnabled: enabled}
-		return r.db.Create(&settings).Error
+	value := "true"
+	if !enabled {
+		value = "false"
 	}
-	settings.RegistrationEnabled = enabled
-	return r.db.Save(&settings).Error
+
+	setting := entity.Setting{
+		Key:   "registration_enabled",
+		Value: value,
+	}
+
+	// Upsert: On conflict update value
+	var count int64
+	r.db.Model(&entity.Setting{}).Where("key = ?", "registration_enabled").Count(&count)
+	if count > 0 {
+		return r.db.Model(&entity.Setting{}).Where("key = ?", "registration_enabled").Update("value", value).Error
+	}
+	return r.db.Create(&setting).Error
 }
 
 func (r *authRepository) HasValidRefreshToken(userID uuid.UUID) (bool, error) {

repositories/connection_repositories.go

@@ -20,7 +20,7 @@ type ConnectionRepository interface {
 	InitializeClient(ctx context.Context, accountID uuid.UUID) (*whatsmeow.Client, <-chan whatsmeow.QRChannelItem, error)
 	UpdateAccountStatus(accountID uuid.UUID, jid string, isActive bool) error
 	DeleteDevice(accountID uuid.UUID) error
-	FindAccountByID(accountID uuid.UUID) (*entity.WhatsAppAccount, error)
+	FindUserByID(accountID uuid.UUID) (*entity.User, error)
 	IsJIDUsedByOther(jid string, currentAccountID uuid.UUID) bool
 }
 
@@ -49,21 +49,18 @@ func NewConnectionRepository(db *gorm.DB) (ConnectionRepository, error) {
 }
 
 func (r *connectionRepository) InitializeClient(ctx context.Context, accountID uuid.UUID) (*whatsmeow.Client, <-chan whatsmeow.QRChannelItem, error) {
-	var acc entity.WhatsAppAccount
+	var user entity.User
 
-	acc = entity.WhatsAppAccount{
-		ID:          accountID,
-		AccountName: "Default Device",
-	}
-	if err := r.db.FirstOrCreate(&acc, entity.WhatsAppAccount{ID: accountID}).Error; err != nil {
-		return nil, nil, http_error.ERR_DB_CONNECTION_FAILED
+	// Check if user exists. accountID should be userID.
+	if err := r.db.First(&user, accountID).Error; err != nil {
+		return nil, nil, http_error.ERR_DB_CONNECTION_FAILED // Or user not found
 	}
 
 	var deviceStore *store.Device
 	var err error
 
-	if acc.JID != "" {
-		jid, parseErr := types.ParseJID(acc.JID)
+	if user.JID != "" {
+		jid, parseErr := types.ParseJID(user.JID)
 		if parseErr != nil {
 			return nil, nil, http_error.ERR_INVALID_JID
 		}
@@ -88,20 +85,20 @@ func (r *connectionRepository) InitializeClient(ctx context.Context, accountID u
 }
 
 func (r *connectionRepository) UpdateAccountStatus(accountID uuid.UUID, jid string, isActive bool) error {
-	return r.db.Model(&entity.WhatsAppAccount{ID: accountID}).Updates(map[string]interface{}{
+	return r.db.Model(&entity.User{ID: accountID}).Updates(map[string]interface{}{
 		"jid":       jid,
 		"is_active": isActive,
 	}).Error
 }
 
 func (r *connectionRepository) DeleteDevice(accountID uuid.UUID) error {
-	var acc entity.WhatsAppAccount
-	if err := r.db.First(&acc, accountID).Error; err != nil {
+	var user entity.User
+	if err := r.db.First(&user, accountID).Error; err != nil {
 		return err
 	}
 
-	if acc.JID != "" {
-		jid, _ := types.ParseJID(acc.JID)
+	if user.JID != "" {
+		jid, _ := types.ParseJID(user.JID)
 		device, err := r.container.GetDevice(context.Background(), jid)
 		if err == nil && device != nil {
 			_ = device.Delete(context.Background())
@@ -111,17 +108,17 @@ func (r *connectionRepository) DeleteDevice(accountID uuid.UUID) error {
 	return r.UpdateAccountStatus(accountID, "", false)
 }
 
-func (r *connectionRepository) FindAccountByID(accountID uuid.UUID) (*entity.WhatsAppAccount, error) {
-	var acc entity.WhatsAppAccount
-	if err := r.db.First(&acc, accountID).Error; err != nil {
+func (r *connectionRepository) FindUserByID(accountID uuid.UUID) (*entity.User, error) {
+	var user entity.User
+	if err := r.db.First(&user, accountID).Error; err != nil {
 		return nil, err
 	}
-	return &acc, nil
+	return &user, nil
 }
 
 func (r *connectionRepository) IsJIDUsedByOther(jid string, currentAccountID uuid.UUID) bool {
 	var count int64
-	r.db.Model(&entity.WhatsAppAccount{}).
+	r.db.Model(&entity.User{}).
 		Where("jid = ? AND id != ?", jid, currentAccountID).
 		Count(&count)
 	return count > 0

services/auth_service.go

@@ -41,8 +41,8 @@ func NewAuthService(authRepo repositories.AuthRepository, connectionRepo reposit
 
 func (s *authService) Register(req dto.RegisterRequest) (*dto.AuthResponse, error) {
 	// Check if registration is enabled
-	settings, _ := s.authRepo.GetSettings()
-	if settings != nil && !settings.RegistrationEnabled {
+	val, _ := s.authRepo.GetSetting("registration_enabled")
+	if val == "false" {
 		return nil, http_error.ERR_REGISTRATION_DISABLED
 	}
 
@@ -134,23 +134,19 @@ func (s *authService) GetMe(userID uuid.UUID) (*dto.MeResponse, error) {
 	}
 
 	resp := &dto.MeResponse{
-		UserID:   user.ID,
-		Username: user.Username,
-		Role:     user.Role,
-	}
-
-	acc, err := s.connectionRepo.FindAccountByID(userID)
-	if err == nil {
-		resp.JID = acc.JID
-		resp.AccountName = acc.AccountName
-		resp.IsActive = acc.IsActive
-
-		if acc.JID != "" {
-			parts := strings.Split(acc.JID, "@")
-			if len(parts) > 0 {
-				phoneUtils := strings.Split(parts[0], ":")
-				resp.Phone = phoneUtils[0]
-			}
+		UserID:      user.ID,
+		Username:    user.Username,
+		Role:        user.Role,
+		JID:         user.JID,
+		AccountName: user.AccountName,
+		IsActive:    user.IsActive,
+	}
+
+	if user.JID != "" {
+		parts := strings.Split(user.JID, "@")
+		if len(parts) > 0 {
+			phoneUtils := strings.Split(parts[0], ":")
+			resp.Phone = phoneUtils[0]
 		}
 	}
 
@@ -203,9 +199,9 @@ func (s *authService) AssignRole(userID uuid.UUID, role string) error {
 }
 
 func (s *authService) IsRegisterEnabled() bool {
-	settings, _ := s.authRepo.GetSettings()
-	if settings == nil {
-		return true
+	val, err := s.authRepo.GetSetting("registration_enabled")
+	if err != nil {
+		return true // Default to true if error fetching, or maybe false? Staying with logic of previous implementation which defaulted to true implicitly if not set.
 	}
-	return settings.RegistrationEnabled
+	return val == "true"
 }