fix: deduplicate ghost feed items (#60)

savannahghi · Oct 5, 2021 · adda962 · adda962
1 parent c532692
commit adda962
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 835 deletions.
diff --git a/pkg/engagement/infrastructure/database/firestore/default_content.go b/pkg/engagement/infrastructure/database/firestore/default_content.go
@@ -1354,16 +1354,15 @@ func feedItemsFromCMSFeedTag(ctx context.Context, flavour feedlib.Flavour, playM
 				Groups:               []string{},
 				NotificationChannels: []feedlib.Channel{},
 			})
+		}
 
-			for _, post := range feedPosts {
-				if post == nil {
-					// non fatal, intentionally
-					log.Printf("ERROR: nil CMS post when adding welcome posts to feed")
-					continue
-				}
-				items = append(items, feedItemFromCMSPost(*post))
+		for _, post := range feedPosts {
+			if post == nil {
+				// non fatal, intentionally
+				log.Printf("ERROR: nil CMS post when adding welcome posts to feed")
+				continue
 			}
-
+			items = append(items, feedItemFromCMSPost(*post))
 		}
 
 		// add the slade 360 video last
@@ -1419,17 +1418,17 @@ func feedItemsFromCMSFeedTag(ctx context.Context, flavour feedlib.Flavour, playM
 				Groups:               []string{},
 				NotificationChannels: []feedlib.Channel{},
 			})
+		}
 
-			for _, post := range feedPosts {
-				if post == nil {
-					// non fatal, intentionally
-					log.Printf("ERROR: nil CMS post when adding welcome posts to feed")
-					continue
-				}
-				items = append(items, feedItemFromCMSPost(*post))
+		for _, post := range feedPosts {
+			if post == nil {
+				// non fatal, intentionally
+				log.Printf("ERROR: nil CMS post when adding welcome posts to feed")
+				continue
 			}
-
+			items = append(items, feedItemFromCMSPost(*post))
 		}
+
 		// add the slade 360 video last
 		items = addSlade360Video(items, future, slade360Youtube, playMP4)
 

diff --git a/pkg/engagement/infrastructure/infrastructure.go b/pkg/engagement/infrastructure/infrastructure.go
@@ -15,14 +15,13 @@ import (
 	"github.com/savannahghi/engagementcore/pkg/engagement/infrastructure/services/surveys"
 	"github.com/savannahghi/engagementcore/pkg/engagement/infrastructure/services/twilio"
 	"github.com/savannahghi/engagementcore/pkg/engagement/infrastructure/services/uploads"
-	"github.com/savannahghi/engagementcore/pkg/engagement/repository"
 	"github.com/savannahghi/serverutils"
 )
 
 // Interactor is an implementation of the infrastructure interface
 // It combines each individual service implementation
 type Interactor struct {
-	repository.Repository
+	database.Repository
 	*fcm.ServiceFCMImpl
 	*library.ServiceLibraryImpl
 	*mail.ServiceMailImpl