From 36faa7c6f8ecb4de2efb9f8288fe932d2c0e2bdc Mon Sep 17 00:00:00 2001
From: Aydrian Howard <aydrian@gmail.com>
Date: Mon, 8 Mar 2021 13:38:52 -0500
Subject: [PATCH] addressing feedback

---
 .../events/types/streamdown/streamdown.go     |  8 +-------
 .../types/streamdown/streamdown_test.go       | 19 -------------------
 internal/events/types/streamup/streamup.go    |  8 +-------
 .../events/types/streamup/streamup_test.go    | 19 -------------------
 4 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/internal/events/types/streamdown/streamdown.go b/internal/events/types/streamdown/streamdown.go
index 10c8feb6..f4f1b3c5 100644
--- a/internal/events/types/streamdown/streamdown.go
+++ b/internal/events/types/streamdown/streamdown.go
@@ -52,7 +52,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 			},
 			Event: models.StreamDownEventSubEvent{
 				BroadcasterUserID:    params.ToUserID,
-				BroadcasterUserLogin: params.ToUserID,
+				BroadcasterUserLogin: params.ToUserName,
 				BroadcasterUserName:  params.ToUserName,
 			},
 		}
@@ -60,12 +60,6 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 		if err != nil {
 			return events.MockEventResponse{}, err
 		}
-	case models.TransportWebSub:
-		body := models.FollowWebSubResponse{} // replace with actual model in internal/models
-		event, err = json.Marshal(body)
-		if err != nil {
-			return events.MockEventResponse{}, err
-		}
 	default:
 		return events.MockEventResponse{}, nil
 	}
diff --git a/internal/events/types/streamdown/streamdown_test.go b/internal/events/types/streamdown/streamdown_test.go
index ca6f2862..aaf0cd30 100644
--- a/internal/events/types/streamdown/streamdown_test.go
+++ b/internal/events/types/streamdown/streamdown_test.go
@@ -34,25 +34,6 @@ func TestEventSub(t *testing.T) {
 	// write actual tests here (making sure you set appropriate values and the like) for eventsub
 }
 
-func TestWebSub(t *testing.T) {
-	a := util.SetupTestEnv(t)
-
-	params := *&events.MockEventParameters{
-		FromUserID: fromUser,
-		ToUserID:   toUser,
-		Transport:  models.TransportWebSub,
-		Trigger:    "unsubscribe",
-	}
-
-	r, err := Event{}.GenerateEvent(params)
-	a.Nil(err)
-
-	var body models.SubWebSubResponse // replace with actual value
-	err = json.Unmarshal(r.JSON, &body)
-	a.Nil(err)
-
-	// write tests here for websub
-}
 func TestFakeTransport(t *testing.T) {
 	a := util.SetupTestEnv(t)
 
diff --git a/internal/events/types/streamup/streamup.go b/internal/events/types/streamup/streamup.go
index aecd05fe..d8a2196e 100644
--- a/internal/events/types/streamup/streamup.go
+++ b/internal/events/types/streamup/streamup.go
@@ -53,7 +53,7 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 			Event: models.StreamUpEventSubEvent{
 				ID:                   util.RandomUserID(),
 				BroadcasterUserID:    params.ToUserID,
-				BroadcasterUserLogin: params.ToUserID,
+				BroadcasterUserLogin: params.ToUserName,
 				BroadcasterUserName:  params.ToUserName,
 				Type:                 "live",
 				StartedAt:            util.GetTimestamp().Format(time.RFC3339Nano),
@@ -63,12 +63,6 @@ func (e Event) GenerateEvent(params events.MockEventParameters) (events.MockEven
 		if err != nil {
 			return events.MockEventResponse{}, err
 		}
-	case models.TransportWebSub:
-		body := models.FollowWebSubResponse{} // replace with actual model in internal/models
-		event, err = json.Marshal(body)
-		if err != nil {
-			return events.MockEventResponse{}, err
-		}
 	default:
 		return events.MockEventResponse{}, nil
 	}
diff --git a/internal/events/types/streamup/streamup_test.go b/internal/events/types/streamup/streamup_test.go
index ce10a34d..e7e33148 100644
--- a/internal/events/types/streamup/streamup_test.go
+++ b/internal/events/types/streamup/streamup_test.go
@@ -34,25 +34,6 @@ func TestEventSub(t *testing.T) {
 	// write actual tests here (making sure you set appropriate values and the like) for eventsub
 }
 
-func TestWebSub(t *testing.T) {
-	a := util.SetupTestEnv(t)
-
-	params := *&events.MockEventParameters{
-		FromUserID: fromUser,
-		ToUserID:   toUser,
-		Transport:  models.TransportWebSub,
-		Trigger:    "unsubscribe",
-	}
-
-	r, err := Event{}.GenerateEvent(params)
-	a.Nil(err)
-
-	var body models.SubWebSubResponse // replace with actual value
-	err = json.Unmarshal(r.JSON, &body)
-	a.Nil(err)
-
-	// write tests here for websub
-}
 func TestFakeTransport(t *testing.T) {
 	a := util.SetupTestEnv(t)