From 4f0b650ac268121440642f221e96a409f266177b Mon Sep 17 00:00:00 2001
From: Jay Chen <admin@trj.tw>
Date: Sun, 21 Jul 2019 09:41:06 +0800
Subject: [PATCH] update code

---
 models/discord/channel.go  | 11 +++++++----
 models/public/facebook.go  | 29 +++++++++++++++++++++++++++++
 pkg/svc/discord/actions.go |  4 ++--
 pkg/svc/discord/events.go  |  2 +-
 pkg/svc/discord/parser.go  |  2 +-
 5 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/models/discord/channel.go b/models/discord/channel.go
index 91df603..e0f4f49 100644
--- a/models/discord/channel.go
+++ b/models/discord/channel.go
@@ -111,8 +111,11 @@ func (p *ChannelModel) SetNotifyState(state bool) (err error) {
 }
 
 // GetFacebookPageList -
-func (p *ChannelModel) GetFacebookPageList() (pages *pubmodel.FacebookPageModel, err error) {
-	db := models.GetConn()
-	_ = db
-	return
+func (p *ChannelModel) GetFacebookPageList() (pages []*pubmodel.FacebookPageModel, err error) {
+	return pubmodel.GetFacebookPageListByChannel(p.ID)
+}
+
+// GetFacebookPageByID -
+func (p *ChannelModel) GetFacebookPageByID(id string) (page *pubmodel.FacebookPageModel, err error) {
+	return pubmodel.GetFacebookPageByChannelAndID(id, p.ID)
 }
diff --git a/models/public/facebook.go b/models/public/facebook.go
index 8aa8c50..c2fb05d 100644
--- a/models/public/facebook.go
+++ b/models/public/facebook.go
@@ -41,6 +41,35 @@ func GetFacebookPageByID(id string) (page *FacebookPageModel, err error) {
 	return
 }
 
+// GetFacebookPageListByChannel -
+func GetFacebookPageListByChannel(channel string) (pages []*FacebookPageModel, err error) {
+	if len(channel) == 0 {
+		return nil, errors.New("channel is empty")
+	}
+	db := models.GetConn()
+	query := `select id, lastpost, ctime, mtime from public.facebook_page where channel = $1`
+	err = db.Select(&pages, query, channel)
+	if err != nil {
+		return nil, err
+	}
+	return
+}
+
+// GetFacebookPageByChannelAndID -
+func GetFacebookPageByChannelAndID(id, channel string) (page *FacebookPageModel, err error) {
+	if len(channel) == 0 || len(id) == 0 {
+		return nil, errors.New("channel or id is empty")
+	}
+	db := models.GetConn()
+	page = &FacebookPageModel{}
+	query := `select id, lastpost, ctime, mtime from public.facebook_page where id = $1 and channel = $2`
+	err = db.Get(page, query, channel)
+	if err != nil {
+		return nil, err
+	}
+	return
+}
+
 // GetAllFacebookPage -
 func GetAllFacebookPage() (pages []*FacebookPageModel, err error) {
 	db := models.GetConn()
diff --git a/pkg/svc/discord/actions.go b/pkg/svc/discord/actions.go
index c5b9ec7..86ab6f0 100644
--- a/pkg/svc/discord/actions.go
+++ b/pkg/svc/discord/actions.go
@@ -6,7 +6,7 @@ import (
 )
 
 func addServer(info EvtInfo, name string) string {
-	exists, err := dsmodel.GetDiscordServerByID(info.Server)
+	exists, err := dsmodel.GetServerByID(info.Server)
 	if err != nil {
 		log.Println("check server exists fail :: ", err)
 		return "check server info fail"
@@ -15,7 +15,7 @@ func addServer(info EvtInfo, name string) string {
 		return "server already setup"
 	}
 
-	ds, err := dsmodel.NewDiscordServer(info.Server, name, 0)
+	ds, err := dsmodel.NewServer(info.Server, name, 0)
 	if err != nil {
 		log.Println("create dsmodel fail :: ", err)
 		return "create server data fail"
diff --git a/pkg/svc/discord/events.go b/pkg/svc/discord/events.go
index a98dae5..eab5943 100644
--- a/pkg/svc/discord/events.go
+++ b/pkg/svc/discord/events.go
@@ -32,7 +32,7 @@ func messageCreateEvt(s *discordgo.Session, evt *discordgo.MessageCreate) {
 	_ = channelID
 	_ = uid
 
-	server, err := dsmodel.GetDiscordServerByID(guildID)
+	server, err := dsmodel.GetServerByID(guildID)
 	if err != nil {
 		log.Println("get server err :: ", err)
 		return
diff --git a/pkg/svc/discord/parser.go b/pkg/svc/discord/parser.go
index 1cdb972..0e92657 100644
--- a/pkg/svc/discord/parser.go
+++ b/pkg/svc/discord/parser.go
@@ -49,7 +49,7 @@ func getCMD(str string) (cmd string, keyword bool) {
 	return
 }
 
-func getRegServerCommandAction(s *discordgo.Session, msgEvt *discordgo.MessageCreate, server *dsmodel.DiscordServerModel, cmd string) (c *pubmodel.CommandModel, acts []*cmdparser.CmdAction, err error) {
+func getRegServerCommandAction(s *discordgo.Session, msgEvt *discordgo.MessageCreate, server *dsmodel.ServerModel, cmd string) (c *pubmodel.CommandModel, acts []*cmdparser.CmdAction, err error) {
 	cmds, err := pubmodel.GetCommandByPlatformBinding(cmd, server.ID, "discord")
 	if err != nil {
 		log.Println("get command err :: ", err)