specifically included otonoko pharmaceuticals

internal/diyhrt/filter.go

@@ -17,20 +17,26 @@ type StoreFilter struct{
 func (f StoreFilter) Filter (stores []Store) []Store {
     result := make([]Store, 0)
 
+    if len(f.IncludeIds) > 0 {
+        for _, s := range stores {
+            if f.Limit > 0 && len(result) >= f.Limit {
+                break
+            }
+
+            if slices.Contains(f.IncludeIds, s.Id) {
+                result = append(result, s)
+            }
+        }
+    }
+
+
     for _, s := range stores {
         if f.Limit > 0 && len(result) >= f.Limit {
             break
         }
 
-        if len(f.IncludeIds) > 0 {
-            if slices.Contains(f.IncludeIds, s.Id) {
-                result = append(result, s)
-            }
-            continue
-        }
 
-
+        if slices.Contains(f.ExcludeIds, s.Id) || slices.Contains(f.IncludeIds, s.Id) {
-        if slices.Contains(f.ExcludeIds, s.Id) {
             continue
         }
 

internal/rendering/config.go

@@ -1,8 +1,10 @@
 package rendering
 
 import (
+	"maps"
+	"slices"
+
 	"gitea.elara.ws/Hazel/transfem-startpage/internal/diyhrt"
-	"fmt"
 )
 
 type RenderingConfig struct {
@@ -40,23 +42,18 @@ func DefaultRenderingConfig() RenderingConfig {
 
 		StoreFilter: diyhrt.StoreFilter{
 			Limit: 4,
+			IncludeIds: []int{7},
 		},
 	}
 }
 
 func (rc *RenderingConfig) LoadDiyHrt(listings []diyhrt.Listing) {
-	existingStores := make(map[int]struct{})
+	existingStores := make(map[int]diyhrt.Store)
-	stores := make([]diyhrt.Store, 0)
 
 	for _, listing := range listings {
-		if _, ok := existingStores[listing.Store.Id]; ok {
+		existingStores[listing.Store.Id] = listing.Store
-			continue
-		}
-
-		fmt.Println(listing.Store.ShipsToCountry)
-		stores = append(stores, listing.Store)
 	}
 
 	rc.Listings = listings
-	rc.Stores = rc.StoreFilter.Filter(stores)
+	rc.Stores = rc.StoreFilter.Filter(slices.Collect(maps.Values(existingStores)))
 }

tmp/build-errors.log

@@ -1 +1 @@
-exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1
+exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1