Remove BaseModel

daqing · Aug 23, 2024 · 8c54485 · 8c54485
1 parent 47321fd
commit 8c54485
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/app/models/base_model.go → app/models/base.go b/app/models/base_model.go → app/models/base.go
@@ -7,15 +7,15 @@ import (
 
 type IdType int64
 
-type BaseModel struct {
-	ID IdType `gorm:"primarykey" json:"id"`
+// type BaseModel struct {
+// 	ID IdType `gorm:"primarykey" json:"id"`
 
-	CreatedAt Timestamp `json:"created_at"`
-	UpdatedAt Timestamp `json:"updated_at"`
+// 	CreatedAt Timestamp `json:"created_at"`
+// 	UpdatedAt Timestamp `json:"updated_at"`
 
-	// Disable `DeletedAt` by default
-	// DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
-}
+// 	// Disable `DeletedAt` by default
+// 	// DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
+// }
 
 type PolyModel interface {
 	PolyId() IdType

diff --git a/app/models/user.go b/app/models/user.go
@@ -5,7 +5,7 @@ import (
 )
 
 type User struct {
-	BaseModel
+	ID IdType `gorm:"primarykey" json:"id"`
 
 	Nickname          string             `json:"nickname"`
 	Username          string             `json:"username"`
@@ -16,6 +16,9 @@ type User struct {
 	APIToken          string             `json:"api_token"`
 	EncryptedPassword string             `json:"-"`
 	Balance           services.PriceCent `json:"balance"`
+
+	CreatedAt Timestamp `json:"created_at"`
+	UpdatedAt Timestamp `json:"updated_at"`
 }
 
 func (u User) TableName() string { return "users" }