1
0

update migrate

This commit is contained in:
2023-04-05 15:05:14 +09:00
parent 9573dc895f
commit 1d65e1194b
36 changed files with 1430 additions and 137 deletions

View File

@ -917,6 +917,11 @@ func (s *CreateCardReq) Encode(e *jx.Encoder) {
// encodeFields encodes fields.
func (s *CreateCardReq) encodeFields(e *jx.Encoder) {
{
e.FieldStart("password")
e.Str(s.Password)
}
{
if s.Card.Set {
e.FieldStart("card")
@ -954,13 +959,14 @@ func (s *CreateCardReq) encodeFields(e *jx.Encoder) {
}
}
var jsonFieldsNameOfCreateCardReq = [6]string{
0: "card",
1: "status",
2: "cp",
3: "url",
4: "created_at",
5: "owner",
var jsonFieldsNameOfCreateCardReq = [7]string{
0: "password",
1: "card",
2: "status",
3: "cp",
4: "url",
5: "created_at",
6: "owner",
}
// Decode decodes CreateCardReq from json.
@ -972,6 +978,18 @@ func (s *CreateCardReq) Decode(d *jx.Decoder) error {
if err := d.ObjBytes(func(d *jx.Decoder, k []byte) error {
switch string(k) {
case "password":
requiredBitSet[0] |= 1 << 0
if err := func() error {
v, err := d.Str()
s.Password = string(v)
if err != nil {
return err
}
return nil
}(); err != nil {
return errors.Wrap(err, "decode field \"password\"")
}
case "card":
if err := func() error {
s.Card.Reset()
@ -1023,7 +1041,7 @@ func (s *CreateCardReq) Decode(d *jx.Decoder) error {
return errors.Wrap(err, "decode field \"created_at\"")
}
case "owner":
requiredBitSet[0] |= 1 << 5
requiredBitSet[0] |= 1 << 6
if err := func() error {
v, err := d.Int()
s.Owner = int(v)
@ -1044,7 +1062,7 @@ func (s *CreateCardReq) Decode(d *jx.Decoder) error {
// Validate required fields.
var failures []validate.FieldError
for i, mask := range [1]uint8{
0b00100000,
0b01000001,
} {
if result := (requiredBitSet[i] & mask) ^ mask; result != 0 {
// Mask only required fields and check equality to mask using XOR.
@ -1104,6 +1122,11 @@ func (s *CreateGroupReq) encodeFields(e *jx.Encoder) {
e.FieldStart("name")
e.Str(s.Name)
}
{
e.FieldStart("password")
e.Str(s.Password)
}
{
if s.Users != nil {
e.FieldStart("users")
@ -1116,9 +1139,10 @@ func (s *CreateGroupReq) encodeFields(e *jx.Encoder) {
}
}
var jsonFieldsNameOfCreateGroupReq = [2]string{
var jsonFieldsNameOfCreateGroupReq = [3]string{
0: "name",
1: "users",
1: "password",
2: "users",
}
// Decode decodes CreateGroupReq from json.
@ -1142,6 +1166,18 @@ func (s *CreateGroupReq) Decode(d *jx.Decoder) error {
}(); err != nil {
return errors.Wrap(err, "decode field \"name\"")
}
case "password":
requiredBitSet[0] |= 1 << 1
if err := func() error {
v, err := d.Str()
s.Password = string(v)
if err != nil {
return err
}
return nil
}(); err != nil {
return errors.Wrap(err, "decode field \"password\"")
}
case "users":
if err := func() error {
s.Users = make([]int, 0)
@ -1171,7 +1207,7 @@ func (s *CreateGroupReq) Decode(d *jx.Decoder) error {
// Validate required fields.
var failures []validate.FieldError
for i, mask := range [1]uint8{
0b00000001,
0b00000011,
} {
if result := (requiredBitSet[i] & mask) ^ mask; result != 0 {
// Mask only required fields and check equality to mask using XOR.
@ -1231,6 +1267,11 @@ func (s *CreateUserReq) encodeFields(e *jx.Encoder) {
e.FieldStart("username")
e.Str(s.Username)
}
{
e.FieldStart("password")
e.Str(s.Password)
}
{
if s.CreatedAt.Set {
e.FieldStart("created_at")
@ -1261,12 +1302,13 @@ func (s *CreateUserReq) encodeFields(e *jx.Encoder) {
}
}
var jsonFieldsNameOfCreateUserReq = [5]string{
var jsonFieldsNameOfCreateUserReq = [6]string{
0: "username",
1: "created_at",
2: "updated_at",
3: "next",
4: "card",
1: "password",
2: "created_at",
3: "updated_at",
4: "next",
5: "card",
}
// Decode decodes CreateUserReq from json.
@ -1290,6 +1332,18 @@ func (s *CreateUserReq) Decode(d *jx.Decoder) error {
}(); err != nil {
return errors.Wrap(err, "decode field \"username\"")
}
case "password":
requiredBitSet[0] |= 1 << 1
if err := func() error {
v, err := d.Str()
s.Password = string(v)
if err != nil {
return err
}
return nil
}(); err != nil {
return errors.Wrap(err, "decode field \"password\"")
}
case "created_at":
if err := func() error {
s.CreatedAt.Reset()
@ -1349,7 +1403,7 @@ func (s *CreateUserReq) Decode(d *jx.Decoder) error {
// Validate required fields.
var failures []validate.FieldError
for i, mask := range [1]uint8{
0b00000001,
0b00000011,
} {
if result := (requiredBitSet[i] & mask) ^ mask; result != 0 {
// Mask only required fields and check equality to mask using XOR.

View File

@ -356,6 +356,7 @@ func (s *CardUpdate) SetCreatedAt(val OptDateTime) {
func (*CardUpdate) updateCardRes() {}
type CreateCardReq struct {
Password string `json:"password"`
Card OptInt `json:"card"`
Status OptString `json:"status"`
Cp OptInt `json:"cp"`
@ -364,6 +365,11 @@ type CreateCardReq struct {
Owner int `json:"owner"`
}
// GetPassword returns the value of Password.
func (s *CreateCardReq) GetPassword() string {
return s.Password
}
// GetCard returns the value of Card.
func (s *CreateCardReq) GetCard() OptInt {
return s.Card
@ -394,6 +400,11 @@ func (s *CreateCardReq) GetOwner() int {
return s.Owner
}
// SetPassword sets the value of Password.
func (s *CreateCardReq) SetPassword(val string) {
s.Password = val
}
// SetCard sets the value of Card.
func (s *CreateCardReq) SetCard(val OptInt) {
s.Card = val
@ -425,8 +436,9 @@ func (s *CreateCardReq) SetOwner(val int) {
}
type CreateGroupReq struct {
Name string `json:"name"`
Users []int `json:"users"`
Name string `json:"name"`
Password string `json:"password"`
Users []int `json:"users"`
}
// GetName returns the value of Name.
@ -434,6 +446,11 @@ func (s *CreateGroupReq) GetName() string {
return s.Name
}
// GetPassword returns the value of Password.
func (s *CreateGroupReq) GetPassword() string {
return s.Password
}
// GetUsers returns the value of Users.
func (s *CreateGroupReq) GetUsers() []int {
return s.Users
@ -444,6 +461,11 @@ func (s *CreateGroupReq) SetName(val string) {
s.Name = val
}
// SetPassword sets the value of Password.
func (s *CreateGroupReq) SetPassword(val string) {
s.Password = val
}
// SetUsers sets the value of Users.
func (s *CreateGroupReq) SetUsers(val []int) {
s.Users = val
@ -451,6 +473,7 @@ func (s *CreateGroupReq) SetUsers(val []int) {
type CreateUserReq struct {
Username string `json:"username"`
Password string `json:"password"`
CreatedAt OptDateTime `json:"created_at"`
UpdatedAt OptDateTime `json:"updated_at"`
Next OptString `json:"next"`
@ -462,6 +485,11 @@ func (s *CreateUserReq) GetUsername() string {
return s.Username
}
// GetPassword returns the value of Password.
func (s *CreateUserReq) GetPassword() string {
return s.Password
}
// GetCreatedAt returns the value of CreatedAt.
func (s *CreateUserReq) GetCreatedAt() OptDateTime {
return s.CreatedAt
@ -487,6 +515,11 @@ func (s *CreateUserReq) SetUsername(val string) {
s.Username = val
}
// SetPassword sets the value of Password.
func (s *CreateUserReq) SetPassword(val string) {
s.Password = val
}
// SetCreatedAt sets the value of CreatedAt.
func (s *CreateUserReq) SetCreatedAt(val OptDateTime) {
s.CreatedAt = val

View File

@ -12,8 +12,11 @@ import (
"t/ent/user"
"github.com/go-faster/jx"
"os"
)
var password = os.Getenv("PASS")
var zero = "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
// OgentHandler implements the ogen generated Handler interface and uses Ent as data layer.
type OgentHandler struct {
client *ent.Client
@ -33,6 +36,7 @@ func rawError(err error) jx.Raw {
func (h *OgentHandler) CreateCard(ctx context.Context, req *CreateCardReq) (CreateCardRes, error) {
b := h.client.Card.Create()
// Add all fields.
b.SetPassword(req.Password)
if v, ok := req.Card.Get(); ok {
b.SetCard(v)
}
@ -49,7 +53,12 @@ func (h *OgentHandler) CreateCard(ctx context.Context, req *CreateCardReq) (Crea
b.SetCreatedAt(v)
}
// Add all edges.
b.SetOwnerID(req.Owner)
if req.Password == password {
b.SetOwnerID(req.Owner)
} else {
b.SetOwnerID(0)
}
// Persist to storage.
e, err := b.Save(ctx)
if err != nil {
@ -109,7 +118,7 @@ func (h *OgentHandler) ReadCard(ctx context.Context, params ReadCardParams) (Rea
// UpdateCard handles PATCH /cards/{id} requests.
func (h *OgentHandler) UpdateCard(ctx context.Context, req *UpdateCardReq, params UpdateCardParams) (UpdateCardRes, error) {
b := h.client.Card.UpdateOneID(params.ID)
b := h.client.Card.UpdateOneID(0)
// Add all fields.
// Add all edges.
if v, ok := req.Owner.Get(); ok {
@ -148,7 +157,7 @@ func (h *OgentHandler) UpdateCard(ctx context.Context, req *UpdateCardReq, param
// DeleteCard handles DELETE /cards/{id} requests.
func (h *OgentHandler) DeleteCard(ctx context.Context, params DeleteCardParams) (DeleteCardRes, error) {
err := h.client.Card.DeleteOneID(params.ID).Exec(ctx)
err := h.client.Card.DeleteOneID(0).Exec(ctx)
if err != nil {
switch {
case ent.IsNotFound(err):
@ -240,6 +249,7 @@ func (h *OgentHandler) CreateGroup(ctx context.Context, req *CreateGroupReq) (Cr
b := h.client.Group.Create()
// Add all fields.
b.SetName(req.Name)
b.SetPassword(req.Password)
// Add all edges.
b.AddUserIDs(req.Users...)
// Persist to storage.
@ -301,7 +311,7 @@ func (h *OgentHandler) ReadGroup(ctx context.Context, params ReadGroupParams) (R
// UpdateGroup handles PATCH /groups/{id} requests.
func (h *OgentHandler) UpdateGroup(ctx context.Context, req *UpdateGroupReq, params UpdateGroupParams) (UpdateGroupRes, error) {
b := h.client.Group.UpdateOneID(params.ID)
b := h.client.Group.UpdateOneID(0)
// Add all fields.
if v, ok := req.Name.Get(); ok {
b.SetName(v)
@ -444,7 +454,12 @@ func (h *OgentHandler) ListGroupUsers(ctx context.Context, params ListGroupUsers
func (h *OgentHandler) CreateUser(ctx context.Context, req *CreateUserReq) (CreateUserRes, error) {
b := h.client.User.Create()
// Add all fields.
b.SetUsername(req.Username)
if req.Password == password {
b.SetUsername(req.Username)
} else {
b.SetUsername("")
}
b.SetPassword(req.Password)
if v, ok := req.CreatedAt.Get(); ok {
b.SetCreatedAt(v)
}
@ -458,6 +473,7 @@ func (h *OgentHandler) CreateUser(ctx context.Context, req *CreateUserReq) (Crea
b.AddCardIDs(req.Card...)
// Persist to storage.
e, err := b.Save(ctx)
if err != nil {
switch {
case ent.IsNotSingular(err):
@ -560,7 +576,7 @@ func (h *OgentHandler) UpdateUser(ctx context.Context, req *UpdateUserReq, param
// DeleteUser handles DELETE /users/{id} requests.
func (h *OgentHandler) DeleteUser(ctx context.Context, params DeleteUserParams) (DeleteUserRes, error) {
err := h.client.User.DeleteOneID(params.ID).Exec(ctx)
err := h.client.User.DeleteOneID(0).Exec(ctx)
if err != nil {
switch {
case ent.IsNotFound(err):