fix: some api bug
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
"fmt"
|
||||
"juwan-backend/app/users/rpc/internal/models/schema"
|
||||
"juwan-backend/app/users/rpc/internal/models/users"
|
||||
"juwan-backend/pkg/types"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -14,7 +15,7 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
)
|
||||
|
||||
// Users is the models entity for the Users schema.
|
||||
// Users is the model entity for the Users schema.
|
||||
type Users struct {
|
||||
config `json:"-"`
|
||||
// ID of the ent.
|
||||
@@ -35,8 +36,6 @@ type Users struct {
|
||||
Bio string `json:"bio,omitempty"`
|
||||
// CurrentRole holds the value of the "current_role" field.
|
||||
CurrentRole string `json:"current_role,omitempty"`
|
||||
// VerifiedRoles holds the value of the "verified_roles" field.
|
||||
VerifiedRoles []string `json:"verified_roles,omitempty"`
|
||||
// VerificationStatus holds the value of the "verificationStatus" field.
|
||||
VerificationStatus schema.VerificationStatusStruct `json:"verificationStatus,omitempty"`
|
||||
// IsAdmin holds the value of the "is_admin" field.
|
||||
@@ -46,8 +45,10 @@ type Users struct {
|
||||
// UpdatedAt holds the value of the "updated_at" field.
|
||||
UpdatedAt time.Time `json:"updated_at,omitempty"`
|
||||
// DeletedAt holds the value of the "deleted_at" field.
|
||||
DeletedAt time.Time `json:"deleted_at,omitempty"`
|
||||
selectValues sql.SelectValues
|
||||
DeletedAt time.Time `json:"deleted_at,omitempty"`
|
||||
// VerifiedRoles holds the value of the "verified_roles" field.
|
||||
VerifiedRoles types.TextArray `json:"verified_roles,omitempty"`
|
||||
selectValues sql.SelectValues
|
||||
}
|
||||
|
||||
// scanValues returns the types for scanning values from sql.Rows.
|
||||
@@ -55,7 +56,7 @@ func (*Users) scanValues(columns []string) ([]any, error) {
|
||||
values := make([]any, len(columns))
|
||||
for i := range columns {
|
||||
switch columns[i] {
|
||||
case users.FieldVerifiedRoles, users.FieldVerificationStatus:
|
||||
case users.FieldVerificationStatus:
|
||||
values[i] = new([]byte)
|
||||
case users.FieldIsAdmin:
|
||||
values[i] = new(sql.NullBool)
|
||||
@@ -65,6 +66,8 @@ func (*Users) scanValues(columns []string) ([]any, error) {
|
||||
values[i] = new(sql.NullString)
|
||||
case users.FieldCreatedAt, users.FieldUpdatedAt, users.FieldDeletedAt:
|
||||
values[i] = new(sql.NullTime)
|
||||
case users.FieldVerifiedRoles:
|
||||
values[i] = new(types.TextArray)
|
||||
default:
|
||||
values[i] = new(sql.UnknownType)
|
||||
}
|
||||
@@ -134,14 +137,6 @@ func (_m *Users) assignValues(columns []string, values []any) error {
|
||||
} else if value.Valid {
|
||||
_m.CurrentRole = value.String
|
||||
}
|
||||
case users.FieldVerifiedRoles:
|
||||
if value, ok := values[i].(*[]byte); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field verified_roles", values[i])
|
||||
} else if value != nil && len(*value) > 0 {
|
||||
if err := json.Unmarshal(*value, &_m.VerifiedRoles); err != nil {
|
||||
return fmt.Errorf("unmarshal field verified_roles: %w", err)
|
||||
}
|
||||
}
|
||||
case users.FieldVerificationStatus:
|
||||
if value, ok := values[i].(*[]byte); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field verificationStatus", values[i])
|
||||
@@ -174,6 +169,12 @@ func (_m *Users) assignValues(columns []string, values []any) error {
|
||||
} else if value.Valid {
|
||||
_m.DeletedAt = value.Time
|
||||
}
|
||||
case users.FieldVerifiedRoles:
|
||||
if value, ok := values[i].(*types.TextArray); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field verified_roles", values[i])
|
||||
} else if value != nil {
|
||||
_m.VerifiedRoles = *value
|
||||
}
|
||||
default:
|
||||
_m.selectValues.Set(columns[i], values[i])
|
||||
}
|
||||
@@ -234,9 +235,6 @@ func (_m *Users) String() string {
|
||||
builder.WriteString("current_role=")
|
||||
builder.WriteString(_m.CurrentRole)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("verified_roles=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.VerifiedRoles))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("verificationStatus=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.VerificationStatus))
|
||||
builder.WriteString(", ")
|
||||
@@ -251,6 +249,9 @@ func (_m *Users) String() string {
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("deleted_at=")
|
||||
builder.WriteString(_m.DeletedAt.Format(time.ANSIC))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("verified_roles=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.VerifiedRoles))
|
||||
builder.WriteByte(')')
|
||||
return builder.String()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user