updating to DMFR v0.5.0 schema (#275)

* updating to DMFR v0.5.0 schema https://github.com/transitland/distributed-mobility-feed-registry/releases/tag/v0.5.0 * Add description to sqlite, postgres schema --------- Co-authored-by: Ian Rees <[email protected]>
interline-io · Jul 17, 2023 · 840cee3 · 840cee3
1 parent 3f44183
commit 840cee3
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/dmfr/registry.go b/dmfr/registry.go
@@ -38,7 +38,7 @@ func ReadRegistry(reader io.Reader) (*Registry, error) {
 	reg.Operators = loadReg.Operators
 	reg.Secrets = loadReg.Secrets
 	if reg.Schema == "" {
-		reg.Schema = "https://dmfr.transit.land/json-schema/dmfr.schema-v0.4.0.json"
+		reg.Schema = "https://dmfr.transit.land/json-schema/dmfr.schema-v0.5.0.json"
 	}
 	operators := []tl.Operator{}
 	for _, rfeed := range loadReg.Feeds {

diff --git a/dmfr/registry_test.go b/dmfr/registry_test.go
@@ -139,17 +139,17 @@ func TestRegistry_Write(t *testing.T) {
 		{
 			"feed",
 			`{"feeds":[{"id":"test","spec":"gtfs"}]}`,
-			`{"$schema":"https://dmfr.transit.land/json-schema/dmfr.schema-v0.4.0.json","feeds":[{"id":"test","spec":"gtfs"}]}`,
+			`{"$schema":"https://dmfr.transit.land/json-schema/dmfr.schema-v0.5.0.json","feeds":[{"id":"test","spec":"gtfs"}]}`,
 		},
 		{
 			"feed sorted",
 			`{"feeds":[{"id":"z","spec":"gtfs"},{"id":"a","spec":"gtfs"}]}`,
-			`{"$schema":"https://dmfr.transit.land/json-schema/dmfr.schema-v0.4.0.json","feeds":[{"id":"a","spec":"gtfs"},{"id":"z","spec":"gtfs"}]}`,
+			`{"$schema":"https://dmfr.transit.land/json-schema/dmfr.schema-v0.5.0.json","feeds":[{"id":"a","spec":"gtfs"},{"id":"z","spec":"gtfs"}]}`,
 		},
 		{
 			"nested operators moved to top level",
 			`{"feeds": [{"id": "z","spec": "gtfs","operators": [{"onestop_id": "o"}]}]}`,
-			`{"$schema":"https://dmfr.transit.land/json-schema/dmfr.schema-v0.4.0.json","feeds":[{"id":"z","spec":"gtfs"}],"operators":[{"onestop_id":"o","associated_feeds":[{"feed_onestop_id":"z"}]}]}`,
+			`{"$schema":"https://dmfr.transit.land/json-schema/dmfr.schema-v0.5.0.json","feeds":[{"id":"z","spec":"gtfs"}],"operators":[{"onestop_id":"o","associated_feeds":[{"feed_onestop_id":"z"}]}]}`,
 		},
 	}
 	for _, tc := range tcs {

diff --git a/internal/schema/postgres/migrations/20230708023621_fetch_wait.up.pgsql b/internal/schema/postgres/migrations/20230708023621_fetch_wait.up.pgsql
@@ -2,4 +2,4 @@ BEGIN;
 
 ALTER TABLE feed_states ADD COLUMN fetch_wait integer;
 
-END;
+COMMIT;
diff --git a/internal/schema/postgres/migrations/20230717211738_feed_description.up.pgsql b/internal/schema/postgres/migrations/20230717211738_feed_description.up.pgsql
@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE current_feeds ADD COLUMN description text;
+
+COMMIT;
diff --git a/internal/schema/sqlite.sql b/internal/schema/sqlite.sql
@@ -11,6 +11,7 @@ CREATE TABLE IF NOT EXISTS "current_feeds" (
   "urls" BLOB,
   "languages" BLOB,
   "name" varchar(255),
+  "description" varchar(255),
   "file" varchar(255) NOT NULL,
   "feed_tags" BLOB
 );

diff --git a/test/data/server/server-test.dmfr.json b/test/data/server/server-test.dmfr.json
@@ -25,6 +25,8 @@
     {
       "spec": "gtfs",
       "id": "BA",
+      "name": "BART",
+      "description": "Bay Area Rapid Transit",
       "urls": {
         "static_current": "../test/data/external/bart.zip"
       }

diff --git a/tl/feed.go b/tl/feed.go
@@ -14,6 +14,7 @@ type Feed struct {
 	FeedID        string            `json:"id" db:"onestop_id"`
 	SupersedesIDs Strings           `json:"supersedes_ids,omitempty" db:"-"`
 	Name          String            `json:"name,omitempty"`
+	Description   String            `json:"description,omitempty"`
 	Spec          string            `json:"spec,omitempty"`
 	URLs          FeedUrls          `json:"urls,omitempty" db:"urls"`
 	Languages     FeedLanguages     `json:"languages,omitempty"`