updated a scraping test

src/orchestrator.go

@@ -9,7 +9,7 @@ import (
 
 type Scraper func(ClientScraper) (*[]*event.Event, error)
 
-func ScrapeEvents(q *event.Queries, client ClientScraper) {
+func ScrapeEvents(q *event.Queries, client ClientScraper, tapology bool) {
 	events := []*event.Event{}
 	scrapers := []Scraper{
 		ScrapeONE,
@@ -25,7 +25,9 @@ func ScrapeEvents(q *event.Queries, client ClientScraper) {
 		}
 	}
 
-	UpdateTapology(q, client, &events)
+	if tapology {
+		UpdateTapology(q, client, &events)
+	}
 
 	if len(events) > 0 {
 		err := q.UpsertEvents(context.Background(), events)
@@ -35,27 +37,6 @@ func ScrapeEvents(q *event.Queries, client ClientScraper) {
 	}
 }
 
-func UpdateAllTapology(q *event.Queries, client ClientScraper) error {
-	events_, err := q.ListEvents(context.Background())
-	if err != nil {
-		return err
-	}
-
-	events := []*event.Event{}
-	for _, e := range events_ {
-		events = append(events, &e)
-	}
-
-	UpdateTapology(q, client, &events)
-
-	err = q.UpsertEvents(context.Background(), events)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func UpdateTapology(q *event.Queries, client ClientScraper, events *[]*event.Event) {
 	err := SetTapologyCSRF(client)
 	if err != nil {
@@ -93,3 +74,24 @@ func UpdateTapology(q *event.Queries, client ClientScraper, events *[]*event.Eve
 		e.MarshalFights(fights)
 	}
 }
+
+func UpdateAllTapology(q *event.Queries, client ClientScraper) error {
+	events_, err := q.ListEvents(context.Background())
+	if err != nil {
+		return err
+	}
+
+	events := []*event.Event{}
+	for _, e := range events_ {
+		events = append(events, &e)
+	}
+
+	UpdateTapology(q, client, &events)
+
+	err = q.UpsertEvents(context.Background(), events)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

src/scrapers_test.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	_ "embed"
 	"fmt"
-	"testing"
 	"net/http"
+	"testing"
 
 	"github.com/PuerkitoBio/goquery"
 )
@@ -122,7 +122,6 @@ func TestUFC(t *testing.T) {
 	if len(*events) < 7 {
 		t.Fatal("Scraping UFC failed: Did not get all events")
 	}
-	//PrintJson(events)
 }
 
 func TestONE(t *testing.T) {
@@ -134,14 +133,16 @@ func TestONE(t *testing.T) {
 	if len(*events) == 0 {
 		t.Fatal("Scraping ONE failed: Events are empty")
 	}
-	//PrintJson(events)
+	if len(*events) < 4 {
+		t.Fatal("Scraping ONE failed: Did not get all events")
+	}
 }
 
 func TestScrapeEvents(t *testing.T) {
 	client := NewDummyClient()
-	q, err := InitDb("test-db.sqlite")
+	q, err := InitDb("db.sqlite")
 	if err != nil {
 		t.Error("Error initializing database: ", err)
 	}
-	ScrapeEvents(q, client)
+	ScrapeEvents(q, client, false)
 }