1
0
This commit is contained in:
2023-04-13 16:50:11 +09:00
parent ab66b9efc0
commit d72f710aaa
20 changed files with 526 additions and 63 deletions

View File

@ -397,6 +397,12 @@ func (s *CardOwnerRead) encodeFields(e *jx.Encoder) {
e.FieldStart("username")
e.Str(s.Username)
}
{
if s.Did.Set {
e.FieldStart("did")
s.Did.Encode(e)
}
}
{
if s.CreatedAt.Set {
e.FieldStart("created_at")
@ -417,12 +423,13 @@ func (s *CardOwnerRead) encodeFields(e *jx.Encoder) {
}
}
var jsonFieldsNameOfCardOwnerRead = [5]string{
var jsonFieldsNameOfCardOwnerRead = [6]string{
0: "id",
1: "username",
2: "created_at",
3: "updated_at",
4: "next",
2: "did",
3: "created_at",
4: "updated_at",
5: "next",
}
// Decode decodes CardOwnerRead from json.
@ -458,6 +465,16 @@ func (s *CardOwnerRead) Decode(d *jx.Decoder) error {
}(); err != nil {
return errors.Wrap(err, "decode field \"username\"")
}
case "did":
if err := func() error {
s.Did.Reset()
if err := s.Did.Decode(d); err != nil {
return err
}
return nil
}(); err != nil {
return errors.Wrap(err, "decode field \"did\"")
}
case "created_at":
if err := func() error {
s.CreatedAt.Reset()
@ -1267,6 +1284,12 @@ func (s *CreateUserReq) encodeFields(e *jx.Encoder) {
e.FieldStart("username")
e.Str(s.Username)
}
{
if s.Did.Set {
e.FieldStart("did")
s.Did.Encode(e)
}
}
{
e.FieldStart("password")
@ -1302,13 +1325,14 @@ func (s *CreateUserReq) encodeFields(e *jx.Encoder) {
}
}
var jsonFieldsNameOfCreateUserReq = [6]string{
var jsonFieldsNameOfCreateUserReq = [7]string{
0: "username",
1: "password",
2: "created_at",
3: "updated_at",
4: "next",
5: "card",
1: "did",
2: "password",
3: "created_at",
4: "updated_at",
5: "next",
6: "card",
}
// Decode decodes CreateUserReq from json.
@ -1332,8 +1356,18 @@ func (s *CreateUserReq) Decode(d *jx.Decoder) error {
}(); err != nil {
return errors.Wrap(err, "decode field \"username\"")
}
case "did":
if err := func() error {
s.Did.Reset()
if err := s.Did.Decode(d); err != nil {
return err
}
return nil
}(); err != nil {
return errors.Wrap(err, "decode field \"did\"")
}
case "password":
requiredBitSet[0] |= 1 << 1
requiredBitSet[0] |= 1 << 2
if err := func() error {
v, err := d.Str()
s.Password = string(v)
@ -1403,7 +1437,7 @@ func (s *CreateUserReq) Decode(d *jx.Decoder) error {
// Validate required fields.
var failures []validate.FieldError
for i, mask := range [1]uint8{
0b00000011,
0b00000101,
} {
if result := (requiredBitSet[i] & mask) ^ mask; result != 0 {
// Mask only required fields and check equality to mask using XOR.
@ -1928,6 +1962,12 @@ func (s *GroupUsersList) encodeFields(e *jx.Encoder) {
e.FieldStart("username")
e.Str(s.Username)
}
{
if s.Did.Set {
e.FieldStart("did")
s.Did.Encode(e)
}
}
{
if s.CreatedAt.Set {
e.FieldStart("created_at")
@ -1948,12 +1988,13 @@ func (s *GroupUsersList) encodeFields(e *jx.Encoder) {
}
}
var jsonFieldsNameOfGroupUsersList = [5]string{
var jsonFieldsNameOfGroupUsersList = [6]string{
0: "id",
1: "username",
2: "created_at",
3: "updated_at",
4: "next",
2: "did",
3: "created_at",
4: "updated_at",
5: "next",
}
// Decode decodes GroupUsersList from json.
@ -1989,6 +2030,16 @@ func (s *GroupUsersList) Decode(d *jx.Decoder) error {
}(); err != nil {
return errors.Wrap(err, "decode field \"username\"")
}
case "did":
if err := func() error {
s.Did.Reset()
if err := s.Did.Decode(d); err != nil {
return err
}
return nil
}(); err != nil {
return errors.Wrap(err, "decode field \"did\"")
}
case "created_at":
if err := func() error {
s.CreatedAt.Reset()
@ -3433,6 +3484,12 @@ func (s *UserCreate) encodeFields(e *jx.Encoder) {
e.FieldStart("username")
e.Str(s.Username)
}
{
if s.Did.Set {
e.FieldStart("did")
s.Did.Encode(e)
}
}
{
if s.CreatedAt.Set {
e.FieldStart("created_at")
@ -3453,12 +3510,13 @@ func (s *UserCreate) encodeFields(e *jx.Encoder) {
}
}
var jsonFieldsNameOfUserCreate = [5]string{
var jsonFieldsNameOfUserCreate = [6]string{
0: "id",
1: "username",
2: "created_at",
3: "updated_at",
4: "next",
2: "did",
3: "created_at",
4: "updated_at",
5: "next",
}
// Decode decodes UserCreate from json.
@ -3494,6 +3552,16 @@ func (s *UserCreate) Decode(d *jx.Decoder) error {
}(); err != nil {
return errors.Wrap(err, "decode field \"username\"")
}
case "did":
if err := func() error {
s.Did.Reset()
if err := s.Did.Decode(d); err != nil {
return err
}
return nil
}(); err != nil {
return errors.Wrap(err, "decode field \"did\"")
}
case "created_at":
if err := func() error {
s.CreatedAt.Reset()
@ -3599,6 +3667,12 @@ func (s *UserList) encodeFields(e *jx.Encoder) {
e.FieldStart("username")
e.Str(s.Username)
}
{
if s.Did.Set {
e.FieldStart("did")
s.Did.Encode(e)
}
}
{
if s.CreatedAt.Set {
e.FieldStart("created_at")
@ -3619,12 +3693,13 @@ func (s *UserList) encodeFields(e *jx.Encoder) {
}
}
var jsonFieldsNameOfUserList = [5]string{
var jsonFieldsNameOfUserList = [6]string{
0: "id",
1: "username",
2: "created_at",
3: "updated_at",
4: "next",
2: "did",
3: "created_at",
4: "updated_at",
5: "next",
}
// Decode decodes UserList from json.
@ -3660,6 +3735,16 @@ func (s *UserList) Decode(d *jx.Decoder) error {
}(); err != nil {
return errors.Wrap(err, "decode field \"username\"")
}
case "did":
if err := func() error {
s.Did.Reset()
if err := s.Did.Decode(d); err != nil {
return err
}
return nil
}(); err != nil {
return errors.Wrap(err, "decode field \"did\"")
}
case "created_at":
if err := func() error {
s.CreatedAt.Reset()
@ -3765,6 +3850,12 @@ func (s *UserRead) encodeFields(e *jx.Encoder) {
e.FieldStart("username")
e.Str(s.Username)
}
{
if s.Did.Set {
e.FieldStart("did")
s.Did.Encode(e)
}
}
{
if s.CreatedAt.Set {
e.FieldStart("created_at")
@ -3785,12 +3876,13 @@ func (s *UserRead) encodeFields(e *jx.Encoder) {
}
}
var jsonFieldsNameOfUserRead = [5]string{
var jsonFieldsNameOfUserRead = [6]string{
0: "id",
1: "username",
2: "created_at",
3: "updated_at",
4: "next",
2: "did",
3: "created_at",
4: "updated_at",
5: "next",
}
// Decode decodes UserRead from json.
@ -3826,6 +3918,16 @@ func (s *UserRead) Decode(d *jx.Decoder) error {
}(); err != nil {
return errors.Wrap(err, "decode field \"username\"")
}
case "did":
if err := func() error {
s.Did.Reset()
if err := s.Did.Decode(d); err != nil {
return err
}
return nil
}(); err != nil {
return errors.Wrap(err, "decode field \"did\"")
}
case "created_at":
if err := func() error {
s.CreatedAt.Reset()
@ -3931,6 +4033,12 @@ func (s *UserUpdate) encodeFields(e *jx.Encoder) {
e.FieldStart("username")
e.Str(s.Username)
}
{
if s.Did.Set {
e.FieldStart("did")
s.Did.Encode(e)
}
}
{
if s.CreatedAt.Set {
e.FieldStart("created_at")
@ -3951,12 +4059,13 @@ func (s *UserUpdate) encodeFields(e *jx.Encoder) {
}
}
var jsonFieldsNameOfUserUpdate = [5]string{
var jsonFieldsNameOfUserUpdate = [6]string{
0: "id",
1: "username",
2: "created_at",
3: "updated_at",
4: "next",
2: "did",
3: "created_at",
4: "updated_at",
5: "next",
}
// Decode decodes UserUpdate from json.
@ -3992,6 +4101,16 @@ func (s *UserUpdate) Decode(d *jx.Decoder) error {
}(); err != nil {
return errors.Wrap(err, "decode field \"username\"")
}
case "did":
if err := func() error {
s.Did.Reset()
if err := s.Did.Decode(d); err != nil {
return err
}
return nil
}(); err != nil {
return errors.Wrap(err, "decode field \"did\"")
}
case "created_at":
if err := func() error {
s.CreatedAt.Reset()

View File

@ -154,6 +154,7 @@ func (s *CardList) SetCreatedAt(val OptDateTime) {
type CardOwnerRead struct {
ID int `json:"id"`
Username string `json:"username"`
Did OptString `json:"did"`
CreatedAt OptDateTime `json:"created_at"`
UpdatedAt OptDateTime `json:"updated_at"`
Next OptString `json:"next"`
@ -169,6 +170,11 @@ func (s *CardOwnerRead) GetUsername() string {
return s.Username
}
// GetDid returns the value of Did.
func (s *CardOwnerRead) GetDid() OptString {
return s.Did
}
// GetCreatedAt returns the value of CreatedAt.
func (s *CardOwnerRead) GetCreatedAt() OptDateTime {
return s.CreatedAt
@ -194,6 +200,11 @@ func (s *CardOwnerRead) SetUsername(val string) {
s.Username = val
}
// SetDid sets the value of Did.
func (s *CardOwnerRead) SetDid(val OptString) {
s.Did = val
}
// SetCreatedAt sets the value of CreatedAt.
func (s *CardOwnerRead) SetCreatedAt(val OptDateTime) {
s.CreatedAt = val
@ -473,6 +484,7 @@ func (s *CreateGroupReq) SetUsers(val []int) {
type CreateUserReq struct {
Username string `json:"username"`
Did OptString `json:"did"`
Password string `json:"password"`
CreatedAt OptDateTime `json:"created_at"`
UpdatedAt OptDateTime `json:"updated_at"`
@ -485,6 +497,11 @@ func (s *CreateUserReq) GetUsername() string {
return s.Username
}
// GetDid returns the value of Did.
func (s *CreateUserReq) GetDid() OptString {
return s.Did
}
// GetPassword returns the value of Password.
func (s *CreateUserReq) GetPassword() string {
return s.Password
@ -515,6 +532,11 @@ func (s *CreateUserReq) SetUsername(val string) {
s.Username = val
}
// SetDid sets the value of Did.
func (s *CreateUserReq) SetDid(val OptString) {
s.Did = val
}
// SetPassword sets the value of Password.
func (s *CreateUserReq) SetPassword(val string) {
s.Password = val
@ -675,6 +697,7 @@ func (*GroupUpdate) updateGroupRes() {}
type GroupUsersList struct {
ID int `json:"id"`
Username string `json:"username"`
Did OptString `json:"did"`
CreatedAt OptDateTime `json:"created_at"`
UpdatedAt OptDateTime `json:"updated_at"`
Next OptString `json:"next"`
@ -690,6 +713,11 @@ func (s *GroupUsersList) GetUsername() string {
return s.Username
}
// GetDid returns the value of Did.
func (s *GroupUsersList) GetDid() OptString {
return s.Did
}
// GetCreatedAt returns the value of CreatedAt.
func (s *GroupUsersList) GetCreatedAt() OptDateTime {
return s.CreatedAt
@ -715,6 +743,11 @@ func (s *GroupUsersList) SetUsername(val string) {
s.Username = val
}
// SetDid sets the value of Did.
func (s *GroupUsersList) SetDid(val OptString) {
s.Did = val
}
// SetCreatedAt sets the value of CreatedAt.
func (s *GroupUsersList) SetCreatedAt(val OptDateTime) {
s.CreatedAt = val
@ -1254,6 +1287,7 @@ func (s *UserCardList) SetCreatedAt(val OptDateTime) {
type UserCreate struct {
ID int `json:"id"`
Username string `json:"username"`
Did OptString `json:"did"`
CreatedAt OptDateTime `json:"created_at"`
UpdatedAt OptDateTime `json:"updated_at"`
Next OptString `json:"next"`
@ -1269,6 +1303,11 @@ func (s *UserCreate) GetUsername() string {
return s.Username
}
// GetDid returns the value of Did.
func (s *UserCreate) GetDid() OptString {
return s.Did
}
// GetCreatedAt returns the value of CreatedAt.
func (s *UserCreate) GetCreatedAt() OptDateTime {
return s.CreatedAt
@ -1294,6 +1333,11 @@ func (s *UserCreate) SetUsername(val string) {
s.Username = val
}
// SetDid sets the value of Did.
func (s *UserCreate) SetDid(val OptString) {
s.Did = val
}
// SetCreatedAt sets the value of CreatedAt.
func (s *UserCreate) SetCreatedAt(val OptDateTime) {
s.CreatedAt = val
@ -1315,6 +1359,7 @@ func (*UserCreate) createUserRes() {}
type UserList struct {
ID int `json:"id"`
Username string `json:"username"`
Did OptString `json:"did"`
CreatedAt OptDateTime `json:"created_at"`
UpdatedAt OptDateTime `json:"updated_at"`
Next OptString `json:"next"`
@ -1330,6 +1375,11 @@ func (s *UserList) GetUsername() string {
return s.Username
}
// GetDid returns the value of Did.
func (s *UserList) GetDid() OptString {
return s.Did
}
// GetCreatedAt returns the value of CreatedAt.
func (s *UserList) GetCreatedAt() OptDateTime {
return s.CreatedAt
@ -1355,6 +1405,11 @@ func (s *UserList) SetUsername(val string) {
s.Username = val
}
// SetDid sets the value of Did.
func (s *UserList) SetDid(val OptString) {
s.Did = val
}
// SetCreatedAt sets the value of CreatedAt.
func (s *UserList) SetCreatedAt(val OptDateTime) {
s.CreatedAt = val
@ -1374,6 +1429,7 @@ func (s *UserList) SetNext(val OptString) {
type UserRead struct {
ID int `json:"id"`
Username string `json:"username"`
Did OptString `json:"did"`
CreatedAt OptDateTime `json:"created_at"`
UpdatedAt OptDateTime `json:"updated_at"`
Next OptString `json:"next"`
@ -1389,6 +1445,11 @@ func (s *UserRead) GetUsername() string {
return s.Username
}
// GetDid returns the value of Did.
func (s *UserRead) GetDid() OptString {
return s.Did
}
// GetCreatedAt returns the value of CreatedAt.
func (s *UserRead) GetCreatedAt() OptDateTime {
return s.CreatedAt
@ -1414,6 +1475,11 @@ func (s *UserRead) SetUsername(val string) {
s.Username = val
}
// SetDid sets the value of Did.
func (s *UserRead) SetDid(val OptString) {
s.Did = val
}
// SetCreatedAt sets the value of CreatedAt.
func (s *UserRead) SetCreatedAt(val OptDateTime) {
s.CreatedAt = val
@ -1435,6 +1501,7 @@ func (*UserRead) readUserRes() {}
type UserUpdate struct {
ID int `json:"id"`
Username string `json:"username"`
Did OptString `json:"did"`
CreatedAt OptDateTime `json:"created_at"`
UpdatedAt OptDateTime `json:"updated_at"`
Next OptString `json:"next"`
@ -1450,6 +1517,11 @@ func (s *UserUpdate) GetUsername() string {
return s.Username
}
// GetDid returns the value of Did.
func (s *UserUpdate) GetDid() OptString {
return s.Did
}
// GetCreatedAt returns the value of CreatedAt.
func (s *UserUpdate) GetCreatedAt() OptDateTime {
return s.CreatedAt
@ -1475,6 +1547,11 @@ func (s *UserUpdate) SetUsername(val string) {
s.Username = val
}
// SetDid sets the value of Did.
func (s *UserUpdate) SetDid(val OptString) {
s.Did = val
}
// SetCreatedAt sets the value of CreatedAt.
func (s *UserUpdate) SetCreatedAt(val OptDateTime) {
s.CreatedAt = val

View File

@ -459,7 +459,11 @@ func (h *OgentHandler) CreateUser(ctx context.Context, req *CreateUserReq) (Crea
} else {
b.SetUsername("")
}
b.SetPassword(req.Password)
if v, ok := req.Did.Get(); ok {
b.SetDid(v)
}
if v, ok := req.CreatedAt.Get(); ok {
b.SetCreatedAt(v)
}

View File

@ -139,6 +139,7 @@ func NewCardOwnerRead(e *ent.User) *CardOwnerRead {
var ret CardOwnerRead
ret.ID = e.ID
ret.Username = e.Username
ret.Did = NewOptString(e.Did)
ret.CreatedAt = NewOptDateTime(e.CreatedAt)
ret.UpdatedAt = NewOptDateTime(e.UpdatedAt)
ret.Next = NewOptString(e.Next)
@ -282,6 +283,7 @@ func NewGroupUsersList(e *ent.User) *GroupUsersList {
var ret GroupUsersList
ret.ID = e.ID
ret.Username = e.Username
ret.Did = NewOptString(e.Did)
ret.CreatedAt = NewOptDateTime(e.CreatedAt)
ret.UpdatedAt = NewOptDateTime(e.UpdatedAt)
ret.Next = NewOptString(e.Next)
@ -313,6 +315,7 @@ func NewUserCreate(e *ent.User) *UserCreate {
var ret UserCreate
ret.ID = e.ID
ret.Username = e.Username
ret.Did = NewOptString(e.Did)
ret.CreatedAt = NewOptDateTime(e.CreatedAt)
ret.UpdatedAt = NewOptDateTime(e.UpdatedAt)
ret.Next = NewOptString(e.Next)
@ -344,6 +347,7 @@ func NewUserList(e *ent.User) *UserList {
var ret UserList
ret.ID = e.ID
ret.Username = e.Username
ret.Did = NewOptString(e.Did)
ret.CreatedAt = NewOptDateTime(e.CreatedAt)
ret.UpdatedAt = NewOptDateTime(e.UpdatedAt)
ret.Next = NewOptString(e.Next)
@ -375,6 +379,7 @@ func NewUserRead(e *ent.User) *UserRead {
var ret UserRead
ret.ID = e.ID
ret.Username = e.Username
ret.Did = NewOptString(e.Did)
ret.CreatedAt = NewOptDateTime(e.CreatedAt)
ret.UpdatedAt = NewOptDateTime(e.UpdatedAt)
ret.Next = NewOptString(e.Next)
@ -406,6 +411,7 @@ func NewUserUpdate(e *ent.User) *UserUpdate {
var ret UserUpdate
ret.ID = e.ID
ret.Username = e.Username
ret.Did = NewOptString(e.Did)
ret.CreatedAt = NewOptDateTime(e.CreatedAt)
ret.UpdatedAt = NewOptDateTime(e.UpdatedAt)
ret.Next = NewOptString(e.Next)