add changelog property and persist errors import across files
This commit is contained in:
+7
-1
@@ -1,11 +1,14 @@
|
||||
package sam
|
||||
|
||||
import (
|
||||
"github.com/pkg/errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/titpetric/factory"
|
||||
)
|
||||
|
||||
var _ = errors.Wrap
|
||||
|
||||
func (*Channel) Edit(r *channelEditRequest) (interface{}, error) {
|
||||
db, err := factory.Database.Get()
|
||||
if err != nil {
|
||||
@@ -19,6 +22,9 @@ func (*Channel) Edit(r *channelEditRequest) (interface{}, error) {
|
||||
|
||||
c := Channel{}.new().SetID(r.id).SetName(r.name).SetTopic(r.topic)
|
||||
if c.GetID() > 0 {
|
||||
if is("topic", c.changed...) {
|
||||
fmt.Println("Topic for channel was changed:", c.GetTopic())
|
||||
}
|
||||
return c, db.Replace("channel", c)
|
||||
}
|
||||
c.SetID(factory.Sonyflake.NextID())
|
||||
|
||||
@@ -4,6 +4,8 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
var _ = errors.Wrap
|
||||
|
||||
func (*Message) Edit(r *messageEditRequest) (interface{}, error) {
|
||||
return nil, errors.New("Not implemented: Message.edit")
|
||||
}
|
||||
|
||||
@@ -2,8 +2,11 @@ package sam
|
||||
|
||||
import (
|
||||
"github.com/pkg/errors"
|
||||
"github.com/titpetric/factory"
|
||||
)
|
||||
|
||||
var _ = errors.Wrap
|
||||
|
||||
func (*Organisation) Edit(r *organisationEditRequest) (interface{}, error) {
|
||||
db, err := factory.Database.Get()
|
||||
if err != nil {
|
||||
|
||||
+5
-2
@@ -2,8 +2,11 @@ package sam
|
||||
|
||||
import (
|
||||
"github.com/pkg/errors"
|
||||
"github.com/titpetric/factory"
|
||||
)
|
||||
|
||||
var _ = errors.Wrap
|
||||
|
||||
func (*Team) Edit(r *teamEditRequest) (interface{}, error) {
|
||||
db, err := factory.Database.Get()
|
||||
if err != nil {
|
||||
@@ -15,8 +18,8 @@ func (*Team) Edit(r *teamEditRequest) (interface{}, error) {
|
||||
if t.GetID() > 0 {
|
||||
return t, db.Replace("team", t)
|
||||
}
|
||||
c.SetID(factory.Sonyflake.NextID())
|
||||
return c, db.Insert("team", t)
|
||||
t.SetID(factory.Sonyflake.NextID())
|
||||
return t, db.Insert("team", t)
|
||||
}
|
||||
|
||||
func (*Team) Remove(r *teamRemoveRequest) (interface{}, error) {
|
||||
|
||||
+2
-8
@@ -41,10 +41,7 @@ func (t *Team) GetMemberIDs() []uint64 {
|
||||
}
|
||||
|
||||
func (t *Team) SetMemberIDs(value []uint64) *Team {
|
||||
if t.MemberIDs != value {
|
||||
t.changed = append(t.changed, "memberids")
|
||||
t.MemberIDs = value
|
||||
}
|
||||
t.MemberIDs = value
|
||||
return t
|
||||
}
|
||||
func (t *Team) GetMembers() []User {
|
||||
@@ -52,9 +49,6 @@ func (t *Team) GetMembers() []User {
|
||||
}
|
||||
|
||||
func (t *Team) SetMembers(value []User) *Team {
|
||||
if t.Members != value {
|
||||
t.changed = append(t.changed, "members")
|
||||
t.Members = value
|
||||
}
|
||||
t.Members = value
|
||||
return t
|
||||
}
|
||||
|
||||
@@ -4,6 +4,8 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
var _ = errors.Wrap
|
||||
|
||||
func (*User) Login(r *userLoginRequest) (interface{}, error) {
|
||||
return nil, errors.New("Not implemented: User.login")
|
||||
}
|
||||
|
||||
@@ -4,6 +4,8 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
var _ = errors.Wrap
|
||||
|
||||
func (*Websocket) Client(r *websocketClientRequest) (interface{}, error) {
|
||||
return nil, errors.New("Not implemented: Websocket.client")
|
||||
}
|
||||
|
||||
@@ -28,9 +28,6 @@ func (w *Websocket) GetUser() User {
|
||||
}
|
||||
|
||||
func (w *Websocket) SetUser(value User) *Websocket {
|
||||
if w.User != value {
|
||||
w.changed = append(w.changed, "user")
|
||||
w.User = value
|
||||
}
|
||||
w.User = value
|
||||
return w
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user