Commit c712a3c

committed

add missing files && cleanup ent

1 parent 43ea80a commit c712a3cCopy full SHA for c712a3c

File tree

+73

-15

lines changed

+73

-15

lines changed

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,6 @@ type Address struct {`
`11`	`11`	`ent.Schema`
`12`	`12`	`}`
`13`	`13`
`14`		`-// Annotations of the User.`
`15`		`-//func (Address) Annotations() []schema.Annotation {`
`16`		`-// return []schema.Annotation{`
`17`		`-// entsql.Annotation{Table: "entAddresses"},`
`18`		`-// }`
`19`		`-//}`
`20`		`-`
`21`	`14`	`// Fields of the Address.`
`22`	`15`	`func (Address) Fields() []ent.Field {`
`23`	`16`	`return []ent.Field{`
`@@ -32,7 +25,6 @@ func (Address) Fields() []ent.Field {`
`32`	`25`	`// Edges of the Address.`
`33`	`26`	`func (Address) Edges() []ent.Edge {`
`34`	`27`	`return []ent.Edge{`
`35`		`- //edge.To("entCountry", Country.Type),`
`36`	`28`	`edge.From("country", Country.Type).Ref("addresses").Unique(),`
`37`	`29`	`edge.To("users", User.Type),`
`38`	`30`	`}`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,6 @@ type User struct {`
`15`	`15`	`ent.Schema`
`16`	`16`	`}`
`17`	`17`
`18`		`-// Annotations of the User.`
`19`		`-//func (User) Annotations() []schema.Annotation {`
`20`		`-// return []schema.Annotation{`
`21`		`-// entsql.Annotation{Table: "entUsers"},`
`22`		`-// }`
`23`		`-//}`
`24`		`-`
`25`	`18`	`// Fields of the User.`
`26`	`19`	`func (User) Fields() []ent.Field {`
`27`	`20`	`return []ent.Field{`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,22 @@`
	`1`	`+package gorm`
	`2`	`+`
	`3`	`+import (`
	`4`	`+ "context"`
	`5`	`+ "fmt"`
	`6`	`+)`
	`7`	`+`
	`8`	`+func (r repo) ListM2M(ctx context.Context) ([]User, error) {`
	`9`	`+ var users []*User`
	`10`	`+`
	`11`	`+ err := r.db.Debug().WithContext(ctx).`
	`12`	`+ Preload("Addresses").`
	`13`	`+ Find(&users).`
	`14`	`+ Select("*").`
	`15`	`+ Limit(30).`
	`16`	`+ Error`
	`17`	`+ if err != nil {`
	`18`	`+ return nil, fmt.Errorf("error loading countries: %w", err)`
	`19`	`+ }`
	`20`	`+`
	`21`	`+ return users, nil`
	`22`	`+}`

Lines changed: 38 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,38 @@`
	`1`	`+package respond`
	`2`	`+`
	`3`	`+import (`
	`4`	`+ "encoding/json"`
	`5`	`+ "log"`
	`6`	`+ "net/http"`
	`7`	`+)`
	`8`	`+`
	`9`	`+func Error(w http.ResponseWriter, statusCode int, message error) {`
	`10`	`+ w.WriteHeader(statusCode)`
	`11`	`+`
	`12`	`+ var p map[string]string`
	`13`	`+ if message == nil {`
	`14`	`+ write(w, nil)`
	`15`	`+ return`
	`16`	`+ }`
	`17`	`+`
	`18`	`+ p = map[string]string{`
	`19`	`+ "message": message.Error(),`
	`20`	`+ }`
	`21`	`+ data, err := json.Marshal(p)`
	`22`	`+ if err != nil {`
	`23`	`+ log.Println(err)`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ if string(data) == "null" {`
	`27`	`+ return`
	`28`	`+ }`
	`29`	`+`
	`30`	`+ write(w, data)`
	`31`	`+}`
	`32`	`+`
	`33`	`+func write(w http.ResponseWriter, data []byte) {`
	`34`	`+ _, err := w.Write(data)`
	`35`	`+ if err != nil {`
	`36`	`+ log.Println(err)`
	`37`	`+ }`
	`38`	`+}`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,13 @@`
	`1`	`+package message`
	`2`	`+`
	`3`	`+import "errors"`
	`4`	`+`
	`5`	`+var (`
	`6`	`+ ErrDBScan = errors.New("db scanning error")`
	`7`	`+ ErrBadRequest = errors.New("bad request")`
	`8`	`+ ErrInternalError = errors.New("internal error")`
	`9`	`+`
	`10`	`+ ErrUpdating = errors.New("error updating")`
	`11`	`+ ErrDeleting = errors.New("error deleting")`
	`12`	`+ ErrRetrieving = errors.New("error retrieving")`
	`13`	`+)`

Comments

(0)