remove feed start/end date

tidbyt · Jan 2, 2024 · b723104 · b723104
1 parent 6bb9f71
commit b723104
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 51 deletions.
diff --git a/manager.go b/manager.go
@@ -325,12 +325,6 @@ func feedActive(feed *storage.FeedMetadata, now time.Time) (bool, error) {
 		feedTz,
 	).Format("20060102")
 
-	if feed.FeedStartDate != "" && feed.FeedStartDate > todayThere {
-		return false, nil
-	}
-	if feed.FeedEndDate != "" && feed.FeedEndDate < todayThere {
-		return false, nil
-	}
 	if feed.CalendarStartDate > todayThere {
 		return false, nil
 	}

diff --git a/storage/postgres.go b/storage/postgres.go
@@ -72,8 +72,6 @@ CREATE TABLE IF NOT EXISTS feed (
     retrieved_at TIMESTAMPTZ NOT NULL,
     calendar_start TEXT NOT NULL,
     calendar_end TEXT NOT NULL,
-    feed_start TEXT NOT NULL,
-    feed_end TEXT NOT NULL,
     timezone TEXT NOT NULL,
     max_arrival TEXT NOT NULL,
     max_departure TEXT NOT NULL,
@@ -119,8 +117,6 @@ SELECT
     retrieved_at,
     calendar_start,
     calendar_end,
-    feed_start,
-    feed_end,
     timezone,
     max_arrival,
     max_departure
@@ -161,8 +157,6 @@ FROM feed`
 			&feed.RetrievedAt,
 			&feed.CalendarStartDate,
 			&feed.CalendarEndDate,
-			&feed.FeedStartDate,
-			&feed.FeedEndDate,
 			&feed.Timezone,
 			&feed.MaxArrival,
 			&feed.MaxDeparture,
@@ -250,19 +244,15 @@ INSERT INTO feed (
     retrieved_at,
     calendar_start,
     calendar_end,
-    feed_start,
-    feed_end,
     timezone,
     max_arrival,
     max_departure
 )
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
 ON CONFLICT (hash, url) DO UPDATE SET
     retrieved_at = excluded.retrieved_at,
     calendar_start = excluded.calendar_start,
     calendar_end = excluded.calendar_end,
-    feed_start = excluded.feed_start,
-    feed_end = excluded.feed_end,
     timezone = excluded.timezone,
     max_arrival = excluded.max_arrival,
     max_departure = excluded.max_departure
@@ -272,8 +262,6 @@ ON CONFLICT (hash, url) DO UPDATE SET
 		feed.RetrievedAt.UTC(),
 		feed.CalendarStartDate,
 		feed.CalendarEndDate,
-		feed.FeedStartDate,
-		feed.FeedEndDate,
 		feed.Timezone,
 		feed.MaxArrival,
 		feed.MaxDeparture,

diff --git a/storage/sqlite.go b/storage/sqlite.go
@@ -58,8 +58,6 @@ CREATE TABLE IF NOT EXISTS feed (
     retrieved_at TIMESTAMP NOT NULL,
     calendar_start TEXT NOT NULL,
     calendar_end TEXT NOT NULL,
-    feed_start TEXT NOT NULL,
-    feed_end TEXT NOT NULL,
     timezone TEXT NOT NULL,
     max_arrival TEXT NOT NULL,
     max_departure TEXT NOT NULL,
@@ -103,8 +101,6 @@ SELECT
     retrieved_at,
     calendar_start,
     calendar_end,
-    feed_start,
-    feed_end,
     timezone,
     max_arrival,
     max_departure
@@ -141,8 +137,6 @@ FROM feed`
 			&feed.RetrievedAt,
 			&feed.CalendarStartDate,
 			&feed.CalendarEndDate,
-			&feed.FeedStartDate,
-			&feed.FeedEndDate,
 			&feed.Timezone,
 			&feed.MaxArrival,
 			&feed.MaxDeparture,
@@ -228,19 +222,15 @@ INSERT INTO feed (
     retrieved_at,
     calendar_start,
     calendar_end,
-    feed_start,
-    feed_end,
     timezone,
     max_arrival,
     max_departure
 )
-VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+VALUES (?, ?, ?, ?, ?, ?, ?, ?)
 ON CONFLICT (hash, url) DO UPDATE SET
     retrieved_at = excluded.retrieved_at,
     calendar_start = excluded.calendar_start,
     calendar_end = excluded.calendar_end,
-    feed_start = excluded.feed_start,
-    feed_end = excluded.feed_end,
     timezone = excluded.timezone,
     max_arrival = excluded.max_arrival,
     max_departure = excluded.max_departure
@@ -250,8 +240,6 @@ ON CONFLICT (hash, url) DO UPDATE SET
 		feed.RetrievedAt,
 		feed.CalendarStartDate,
 		feed.CalendarEndDate,
-		feed.FeedStartDate,
-		feed.FeedEndDate,
 		feed.Timezone,
 		feed.MaxArrival,
 		feed.MaxDeparture,

diff --git a/storage/storage.go b/storage/storage.go
@@ -4,11 +4,6 @@ import (
 	"time"
 )
 
-// TODO:
-// - Remove UpdatedAt from FeedMetadata
-// - s/FeedMetadata/Feed/
-// - Remove FeedStartDate/FeedEndDate
-
 type Storage interface {
 	// Retrieves all feed metadata records matching the given
 	// filter.
@@ -68,8 +63,6 @@ type FeedMetadata struct {
 	Timezone          string
 	CalendarStartDate string
 	CalendarEndDate   string
-	FeedStartDate     string
-	FeedEndDate       string
 	MaxArrival        string
 	MaxDeparture      string
 }

diff --git a/storage/storage_test.go b/storage/storage_test.go
@@ -1690,8 +1690,6 @@ func testFeedMetadataReadWrite(t *testing.T, sb StorageBuilder) {
 		RetrievedAt:       time.Date(2018, 1, 2, 3, 4, 5, 0, time.UTC),
 		CalendarStartDate: "20190201",
 		CalendarEndDate:   "20191131",
-		FeedStartDate:     "20190101",
-		FeedEndDate:       "20191231",
 		MaxArrival:        "123456",
 		MaxDeparture:      "654321",
 	})
@@ -1703,8 +1701,6 @@ func testFeedMetadataReadWrite(t *testing.T, sb StorageBuilder) {
 		RetrievedAt:       time.Date(2018, 2, 3, 4, 5, 6, 0, time.UTC),
 		CalendarStartDate: "20190202",
 		CalendarEndDate:   "20191130",
-		FeedStartDate:     "20190102",
-		FeedEndDate:       "20191230",
 		MaxArrival:        "123457",
 		MaxDeparture:      "754321",
 	})
@@ -1719,17 +1715,13 @@ func testFeedMetadataReadWrite(t *testing.T, sb StorageBuilder) {
 	assert.True(t, time.Date(2018, 2, 3, 4, 5, 6, 0, time.UTC).Equal(feeds[0].RetrievedAt))
 	assert.Equal(t, "20190202", feeds[0].CalendarStartDate)
 	assert.Equal(t, "20191130", feeds[0].CalendarEndDate)
-	assert.Equal(t, "20190102", feeds[0].FeedStartDate)
-	assert.Equal(t, "20191230", feeds[0].FeedEndDate)
 	assert.Equal(t, "123457", feeds[0].MaxArrival)
 	assert.Equal(t, "754321", feeds[0].MaxDeparture)
 	assert.Equal(t, "feed1", feeds[1].Hash)
 	assert.Equal(t, "https://gtfs/feed1", feeds[1].URL)
 	assert.True(t, time.Date(2018, 1, 2, 3, 4, 5, 0, time.UTC).Equal(feeds[1].RetrievedAt))
 	assert.Equal(t, "20190201", feeds[1].CalendarStartDate)
 	assert.Equal(t, "20191131", feeds[1].CalendarEndDate)
-	assert.Equal(t, "20190101", feeds[1].FeedStartDate)
-	assert.Equal(t, "20191231", feeds[1].FeedEndDate)
 	assert.Equal(t, "123456", feeds[1].MaxArrival)
 	assert.Equal(t, "654321", feeds[1].MaxDeparture)
 
@@ -1740,8 +1732,6 @@ func testFeedMetadataReadWrite(t *testing.T, sb StorageBuilder) {
 		RetrievedAt:       time.Date(2019, 2, 3, 4, 5, 6, 0, time.UTC),
 		CalendarStartDate: "20200202",
 		CalendarEndDate:   "20201130",
-		FeedStartDate:     "20200102",
-		FeedEndDate:       "20201230",
 		MaxArrival:        "123458",
 		MaxDeparture:      "854321",
 	})
@@ -1756,8 +1746,6 @@ func testFeedMetadataReadWrite(t *testing.T, sb StorageBuilder) {
 	assert.True(t, time.Date(2019, 2, 3, 4, 5, 6, 0, time.UTC).Equal(feeds[0].RetrievedAt))
 	assert.Equal(t, "20200202", feeds[0].CalendarStartDate)
 	assert.Equal(t, "20201130", feeds[0].CalendarEndDate)
-	assert.Equal(t, "20200102", feeds[0].FeedStartDate)
-	assert.Equal(t, "20201230", feeds[0].FeedEndDate)
 	assert.Equal(t, "123458", feeds[0].MaxArrival)
 	assert.Equal(t, "854321", feeds[0].MaxDeparture)
 }