diff --git a/code/models.lua b/code/models.lua index 4feae6c..22dd64e 100644 --- a/code/models.lua +++ b/code/models.lua @@ -72,7 +72,7 @@ local Users = Model:extend("users", { }) -- date? -local Favorite_tracks = Model:extend("favorite_trackss", { +local Favorite_tracks = Model:extend("favorite_tracks", { relations = { {"user", belongs_to = "Users"}, {"track", has_one = "Tracks"} diff --git a/code/schemas.lua b/code/schemas.lua index f0842bc..3ab839b 100644 --- a/code/schemas.lua +++ b/code/schemas.lua @@ -4,6 +4,10 @@ local uuid = require("resty.uuid") local types = schema.types local create_index = schema.create_index +-- ----------- -- +-- Track stuff -- +-- ----------- -- + -- labels schema.create_table("labels", { {"uuid", types.varchar}, @@ -84,6 +88,10 @@ schema.create_table("airtime", { create_index("airtime", "date", "station") +-- ---------- -- +-- User stuff -- +-- ---------- -- + -- users schema.create_table("users", { {"uuid", types.varchar}, diff --git a/docker-compose.yml b/docker-compose.yml index 23563af..7804f0d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,14 +2,12 @@ version: "3" services: previouslyonifm: build: . - restart: always volumes: - ./code:/srv/lapis ports: - - "8080:8080" + - "8082:8080" postgres: image: postgres:12-alpine - restart: always environment: POSTGRES_PASSWORD: the_password