From 93e3a8e4f5d34809cba1e69e1e6c13a4d647a3e2 Mon Sep 17 00:00:00 2001
From: Naoki Kosaka <n.k@mail.yukimochi.net>
Date: Sun, 6 Jan 2019 12:34:52 +0900
Subject: [PATCH] Fix bugs for unfollow cli.

---
 cli/domain.go      |  2 +-
 cli/domain_test.go | 30 ++++++++++++++++++++++++------
 cli/follow.go      |  4 ++--
 cli/follow_test.go | 20 +++++++++++++++++++-
 4 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/cli/domain.go b/cli/domain.go
index c49afb7..eb70f7d 100644
--- a/cli/domain.go
+++ b/cli/domain.go
@@ -126,8 +126,8 @@ func unfollowDomains(cmd *cobra.Command, args []string) error {
 				relayState.DelSubscription(subscription.Domain)
 				break
 			}
-			fmt.Println("Invalid domain given")
 		}
+		cmd.Println("Invalid domain [" + domain + "] given")
 	}
 
 	return nil
diff --git a/cli/domain_test.go b/cli/domain_test.go
index 9156b0f..a23d046 100644
--- a/cli/domain_test.go
+++ b/cli/domain_test.go
@@ -198,21 +198,39 @@ func TestUnfollowDomain(t *testing.T) {
 	app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
 	app.Execute()
 
-	buffer := new(bytes.Buffer)
-	app.SetOutput(buffer)
-
 	app.SetArgs([]string{"domain", "unfollow", "subscription.example.jp"})
 	app.Execute()
 
 	valid := true
-	for _, domain := range relayState.LimitedDomains {
-		if domain == "subscription.example.jp" {
+	for _, domain := range relayState.Subscriptions {
+		if domain.Domain == "subscription.example.jp" {
 			valid = false
 		}
 	}
 
 	if !valid {
-		t.Fatalf("Do not unfollow domain")
+		t.Fatalf("Not unfollowed domain")
+	}
+
+	relayState.RedisClient.FlushAll().Result()
+	relayState.Load()
+}
+
+func TestInvalidUnfollowDomain(t *testing.T) {
+	app := buildNewCmd()
+
+	app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
+	app.Execute()
+
+	buffer := new(bytes.Buffer)
+	app.SetOutput(buffer)
+
+	app.SetArgs([]string{"domain", "unfollow", "unknown.tld"})
+	app.Execute()
+
+	output := buffer.String()
+	if strings.Split(output, "\n")[0] != "Invalid domain [unknown.tld] given" {
+		t.Fatalf("Invalid Responce.")
 	}
 
 	relayState.RedisClient.FlushAll().Result()
diff --git a/cli/follow.go b/cli/follow.go
index 0e29619..47d3b72 100644
--- a/cli/follow.go
+++ b/cli/follow.go
@@ -137,7 +137,7 @@ func acceptFollow(cmd *cobra.Command, args []string) error {
 				break
 			}
 		}
-		cmd.Println("Invalid domain given")
+		cmd.Println("Invalid domain [" + domain + "] given")
 	}
 
 	return nil
@@ -161,8 +161,8 @@ func rejectFollow(cmd *cobra.Command, args []string) error {
 				createFollowRequestResponse(domain, "Reject")
 				break
 			}
-			cmd.Println("Invalid domain given")
 		}
+		cmd.Println("Invalid domain [" + domain + "] given")
 	}
 
 	return nil
diff --git a/cli/follow_test.go b/cli/follow_test.go
index 52251a5..eac4831 100644
--- a/cli/follow_test.go
+++ b/cli/follow_test.go
@@ -102,7 +102,25 @@ func TestInvalidFollow(t *testing.T) {
 	app.Execute()
 
 	output := buffer.String()
-	if strings.Split(output, "\n")[0] != "Invalid domain given" {
+	if strings.Split(output, "\n")[0] != "Invalid domain [unknown.tld] given" {
+		t.Fatalf("Invalid Responce.")
+	}
+
+	relayState.RedisClient.FlushAll().Result()
+	relayState.Load()
+}
+
+func TestInvalidRejectFollow(t *testing.T) {
+	app := buildNewCmd()
+
+	buffer := new(bytes.Buffer)
+	app.SetOutput(buffer)
+
+	app.SetArgs([]string{"follow", "reject", "unknown.tld"})
+	app.Execute()
+
+	output := buffer.String()
+	if strings.Split(output, "\n")[0] != "Invalid domain [unknown.tld] given" {
 		t.Fatalf("Invalid Responce.")
 	}