From ff79246202e4684202c765b957bc1d6beca7278a Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@kendu.si>
Date: Thu, 19 Jul 2018 19:09:07 +0200
Subject: [PATCH] Fix codegen template for rest controllers, remove obsolete
 code

---
 codegen/templates/http_.tpl |  4 +++-
 sam/rest/auth.go            |  4 ----
 sam/rest/event.go           | 43 -------------------------------------
 sam/rest/message.go         | 14 ++++++------
 4 files changed, 10 insertions(+), 55 deletions(-)
 delete mode 100644 sam/rest/event.go

diff --git a/codegen/templates/http_.tpl b/codegen/templates/http_.tpl
index 431dbb0c6..03688cca4 100644
--- a/codegen/templates/http_.tpl
+++ b/codegen/templates/http_.tpl
@@ -1,6 +1,8 @@
 package {package}
 
 import (
+	"context"
+	"github.com/crusttech/crust/sam/rest/server"
 	"github.com/pkg/errors"
 )
 
@@ -13,7 +15,7 @@ func ({name}) New() *{name} {
 }
 
 {foreach $calls as $call}
-func (*{name}) {call.name|capitalize}(r *{name|lcfirst}{call.name|capitalize}Request) (interface{}, error) {
+func (ctrl *{name}) {call.name|capitalize}(ctx context.Context, r *server.{name|ucfirst}{call.name|capitalize}Request) (interface{}, error) {
 	return nil, errors.New("Not implemented: {name}.{call.name}")
 }
 
diff --git a/sam/rest/auth.go b/sam/rest/auth.go
index acdc2e63d..eeb35c7c5 100644
--- a/sam/rest/auth.go
+++ b/sam/rest/auth.go
@@ -26,10 +26,6 @@ func (*Channel) Authenticator() func(http.Handler) http.Handler {
 	return pass
 }
 
-func (*Event) Authenticator() func(http.Handler) http.Handler {
-	return pass
-}
-
 func (*User) Authenticator() func(http.Handler) http.Handler {
 	return pass
 }
diff --git a/sam/rest/event.go b/sam/rest/event.go
deleted file mode 100644
index 1761c6e33..000000000
--- a/sam/rest/event.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package rest
-
-import (
-	"context"
-	"github.com/crusttech/crust/sam/rest/server"
-	"github.com/pkg/errors"
-)
-
-var _ = errors.Wrap
-
-type Event struct{}
-
-func (Event) New() *Event {
-	return &Event{}
-}
-
-func (ctrl *Event) Edit(ctx context.Context, r *server.EventEditRequest) (interface{}, error) {
-	return nil, errors.New("Not implemented: Event.....")
-}
-
-func (ctrl *Event) Attach(ctx context.Context, r *server.EventAttachRequest) (interface{}, error) {
-	return nil, errors.New("Not implemented: Event.....")
-}
-
-func (ctrl *Event) Remove(ctx context.Context, r *server.EventRemoveRequest) (interface{}, error) {
-	return nil, errors.New("Not implemented: Event.....")
-}
-
-func (ctrl *Event) Read(ctx context.Context, r *server.EventReadRequest) (interface{}, error) {
-	return nil, errors.New("Not implemented: Event.....")
-}
-
-func (ctrl *Event) Search(ctx context.Context, r *server.EventSearchRequest) (interface{}, error) {
-	return nil, errors.New("Not implemented: Event.....")
-}
-
-func (ctrl *Event) Pin(ctx context.Context, r *server.EventPinRequest) (interface{}, error) {
-	return nil, errors.New("Not implemented: Event.....")
-}
-
-func (ctrl *Event) Flag(ctx context.Context, r *server.EventFlagRequest) (interface{}, error) {
-	return nil, errors.New("Not implemented: Event.....")
-}
diff --git a/sam/rest/message.go b/sam/rest/message.go
index 7915babf0..db95a99c4 100644
--- a/sam/rest/message.go
+++ b/sam/rest/message.go
@@ -14,30 +14,30 @@ func (Message) New() *Message {
 	return &Message{}
 }
 
-func (*Message) Edit(ctx context.Context, r *server.MessageEditRequest) (interface{}, error) {
+func (ctrl *Message) Edit(ctx context.Context, r *server.MessageEditRequest) (interface{}, error) {
 	return nil, errors.New("Not implemented: Message.edit")
 }
 
-func (*Message) Attach(ctx context.Context, r *server.MessageAttachRequest) (interface{}, error) {
+func (ctrl *Message) Attach(ctx context.Context, r *server.MessageAttachRequest) (interface{}, error) {
 	return nil, errors.New("Not implemented: Message.attach")
 }
 
-func (*Message) Remove(ctx context.Context, r *server.MessageRemoveRequest) (interface{}, error) {
+func (ctrl *Message) Remove(ctx context.Context, r *server.MessageRemoveRequest) (interface{}, error) {
 	return nil, errors.New("Not implemented: Message.remove")
 }
 
-func (*Message) Read(ctx context.Context, r *server.MessageReadRequest) (interface{}, error) {
+func (ctrl *Message) Read(ctx context.Context, r *server.MessageReadRequest) (interface{}, error) {
 	return nil, errors.New("Not implemented: Message.read")
 }
 
-func (*Message) Search(ctx context.Context, r *server.MessageSearchRequest) (interface{}, error) {
+func (ctrl *Message) Search(ctx context.Context, r *server.MessageSearchRequest) (interface{}, error) {
 	return nil, errors.New("Not implemented: Message.search")
 }
 
-func (*Message) Pin(ctx context.Context, r *server.MessagePinRequest) (interface{}, error) {
+func (ctrl *Message) Pin(ctx context.Context, r *server.MessagePinRequest) (interface{}, error) {
 	return nil, errors.New("Not implemented: Message.pin")
 }
 
-func (*Message) Flag(ctx context.Context, r *server.MessageFlagRequest) (interface{}, error) {
+func (ctrl *Message) Flag(ctx context.Context, r *server.MessageFlagRequest) (interface{}, error) {
 	return nil, errors.New("Not implemented: Message.flag")
 }