From bc1f3aeb4c4c53d971cc1e29f8839e78802c50df Mon Sep 17 00:00:00 2001
From: Tit Petric <black@scene-si.org>
Date: Fri, 6 Jul 2018 10:32:07 +0000
Subject: [PATCH] fix constructors, skip password compare as it's a complex
 type

---
 sam/channel.go                    | 4 ++--
 sam/channel.interfaces.go         | 2 +-
 sam/docs/src/spec.json            | 2 +-
 sam/docs/src/spec/user.json       | 1 +
 sam/message.interfaces.go         | 2 +-
 sam/organisation.go               | 4 ++--
 sam/organisation.interfaces.go    | 2 +-
 sam/team.go                       | 4 ++--
 sam/team.interfaces.go            | 2 +-
 sam/templates/http_interfaces.tpl | 2 +-
 sam/user.go                       | 4 ++--
 sam/user.interfaces.go            | 2 +-
 sam/user.structs.go               | 5 +----
 sam/websocket.interfaces.go       | 2 +-
 14 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/sam/channel.go b/sam/channel.go
index ef2233e68..8941b3eb1 100644
--- a/sam/channel.go
+++ b/sam/channel.go
@@ -26,7 +26,7 @@ func (*Channel) Edit(r *channelEditRequest) (interface{}, error) {
 	// @todo: permission check if user can add channel
 	// @todo: make sure archived & deleted entries can not be edited
 
-	c := Channel{}.new().SetID(r.id).SetName(r.name).SetTopic(r.topic)
+	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())
@@ -63,7 +63,7 @@ func (*Channel) Read(r *channelReadRequest) (interface{}, error) {
 
 	// @todo: permission check if user can read channel
 
-	c := Channel{}.new()
+	c := Channel{}.New()
 	return c, db.Get(c, sqlChannelSelect+" AND id = ?", r.id)
 }
 
diff --git a/sam/channel.interfaces.go b/sam/channel.interfaces.go
index 4711b6d44..2659fd086 100644
--- a/sam/channel.interfaces.go
+++ b/sam/channel.interfaces.go
@@ -11,7 +11,7 @@ type ChannelHandlers struct {
 
 func (ChannelHandlers) new() *ChannelHandlers {
 	return &ChannelHandlers{
-		Channel{}.new(),
+		Channel{}.New(),
 	}
 }
 
diff --git a/sam/docs/src/spec.json b/sam/docs/src/spec.json
index ccb5d27f4..1ac9db6da 100644
--- a/sam/docs/src/spec.json
+++ b/sam/docs/src/spec.json
@@ -370,7 +370,7 @@
 				"fields": [
 					{ "type": "uint64", "name": "ID" },
 					{ "type": "string", "name": "Username" },
-					{ "type": "[]byte", "name": "Password", "tag": "json:\"-\"" },
+					{ "type": "[]byte", "name": "Password", "tag": "json:\"-\"", "complex": true },
 					{ "type": "*time.Time", "name": "SuspendedAt", "tag": "json:\",omitempty\"", "complex": true },
 					{ "type": "*time.Time", "name": "DeletedAt", "tag": "json:\",omitempty\"", "complex": true }
 				]
diff --git a/sam/docs/src/spec/user.json b/sam/docs/src/spec/user.json
index 53aca55b6..131b1ec15 100644
--- a/sam/docs/src/spec/user.json
+++ b/sam/docs/src/spec/user.json
@@ -14,6 +14,7 @@
           "type": "string"
         },
         {
+          "complex": true,
           "name": "Password",
           "tag": "json:\"-\"",
           "type": "[]byte"
diff --git a/sam/message.interfaces.go b/sam/message.interfaces.go
index 22e17bef0..b7554124d 100644
--- a/sam/message.interfaces.go
+++ b/sam/message.interfaces.go
@@ -11,7 +11,7 @@ type MessageHandlers struct {
 
 func (MessageHandlers) new() *MessageHandlers {
 	return &MessageHandlers{
-		Message{}.new(),
+		Message{}.New(),
 	}
 }
 
diff --git a/sam/organisation.go b/sam/organisation.go
index de9f37480..e839cb853 100644
--- a/sam/organisation.go
+++ b/sam/organisation.go
@@ -22,7 +22,7 @@ func (*Organisation) Edit(r *organisationEditRequest) (interface{}, error) {
 	// @todo: permission check if user can add/edit organisation
 	// @todo: make sure archived & deleted entries can not be edited
 
-	o := Organisation{}.new().SetID(r.id).SetName(r.name)
+	o := Organisation{}.New().SetID(r.id).SetName(r.name)
 	if o.GetID() > 0 {
 		return o, db.Replace("organisation", o)
 	}
@@ -55,7 +55,7 @@ func (*Organisation) Read(r *organisationReadRequest) (interface{}, error) {
 
 	// @todo: permissions check
 
-	o := Organisation{}.new()
+	o := Organisation{}.New()
 	return o, db.Get(o, sqlOrganisationSelect+" AND id = ?", r.id)
 }
 
diff --git a/sam/organisation.interfaces.go b/sam/organisation.interfaces.go
index dc88f7355..1c148459c 100644
--- a/sam/organisation.interfaces.go
+++ b/sam/organisation.interfaces.go
@@ -11,7 +11,7 @@ type OrganisationHandlers struct {
 
 func (OrganisationHandlers) new() *OrganisationHandlers {
 	return &OrganisationHandlers{
-		Organisation{}.new(),
+		Organisation{}.New(),
 	}
 }
 
diff --git a/sam/team.go b/sam/team.go
index d044ef386..65e5226b1 100644
--- a/sam/team.go
+++ b/sam/team.go
@@ -22,7 +22,7 @@ func (*Team) Edit(r *teamEditRequest) (interface{}, error) {
 	// @todo: permission check if user can add/edit the team
 	// @todo: make sure archived & deleted entries can not be edited
 
-	t := Team{}.new()
+	t := Team{}.New()
 	t.SetID(r.id).SetName(r.name).SetMemberIDs(r.members)
 	if t.GetID() > 0 {
 		return t, db.Replace("team", t)
@@ -51,7 +51,7 @@ func (*Team) Read(r *teamReadRequest) (interface{}, error) {
 		return nil, err
 	}
 
-	t := Team{}.new()
+	t := Team{}.New()
 	return t, db.Get(t, sqlTeamSelect+" AND id = ?", r.id)
 }
 
diff --git a/sam/team.interfaces.go b/sam/team.interfaces.go
index 43a217a6a..ad637de08 100644
--- a/sam/team.interfaces.go
+++ b/sam/team.interfaces.go
@@ -11,7 +11,7 @@ type TeamHandlers struct {
 
 func (TeamHandlers) new() *TeamHandlers {
 	return &TeamHandlers{
-		Team{}.new(),
+		Team{}.New(),
 	}
 }
 
diff --git a/sam/templates/http_interfaces.tpl b/sam/templates/http_interfaces.tpl
index 36eb9cc63..e9a1b65d7 100644
--- a/sam/templates/http_interfaces.tpl
+++ b/sam/templates/http_interfaces.tpl
@@ -11,7 +11,7 @@ type {name}Handlers struct {
 
 func ({name}Handlers) new() *{name}Handlers {
 	return &{name}Handlers{
-		{name}{}.new(),
+		{name}{}.New(),
 	}
 }
 
diff --git a/sam/user.go b/sam/user.go
index 1512cb489..1e2dff53e 100644
--- a/sam/user.go
+++ b/sam/user.go
@@ -19,7 +19,7 @@ func (*User) Read(r *teamReadRequest) (interface{}, error) {
 		return nil, err
 	}
 
-	t := User{}.new()
+	t := User{}.New()
 	return t, db.Get(t, sqlUserSelect+" AND id = ?", r.id)
 }
 
@@ -31,7 +31,7 @@ func (*User) Login(r *userLoginRequest) (interface{}, error) {
 	}
 
 	u := &User{}
-	if err != db.Get(u, sqlUserSelect+" AND username = ?", r.username) {
+	if err = db.Get(u, sqlUserSelect+" AND username = ?", r.username); err != nil {
 		return nil, err
 	}
 
diff --git a/sam/user.interfaces.go b/sam/user.interfaces.go
index c26611da9..d6c6a83fd 100644
--- a/sam/user.interfaces.go
+++ b/sam/user.interfaces.go
@@ -11,7 +11,7 @@ type UserHandlers struct {
 
 func (UserHandlers) new() *UserHandlers {
 	return &UserHandlers{
-		User{}.new(),
+		User{}.New(),
 	}
 }
 
diff --git a/sam/user.structs.go b/sam/user.structs.go
index f5cc56827..4b3ba520c 100644
--- a/sam/user.structs.go
+++ b/sam/user.structs.go
@@ -50,10 +50,7 @@ func (u *User) GetPassword() []byte {
 }
 
 func (u *User) SetPassword(value []byte) *User {
-	if u.Password != value {
-		u.changed = append(u.changed, "Password")
-		u.Password = value
-	}
+	u.Password = value
 	return u
 }
 func (u *User) GetSuspendedAt() *time.Time {
diff --git a/sam/websocket.interfaces.go b/sam/websocket.interfaces.go
index 58407c717..82704c85c 100644
--- a/sam/websocket.interfaces.go
+++ b/sam/websocket.interfaces.go
@@ -11,7 +11,7 @@ type WebsocketHandlers struct {
 
 func (WebsocketHandlers) new() *WebsocketHandlers {
 	return &WebsocketHandlers{
-		Websocket{}.new(),
+		Websocket{}.New(),
 	}
 }