From 7f6fe3e350f5cfccd252c14567aa6f7dedd53674 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 3 May 2024 22:40:28 +0200 Subject: [PATCH 1/6] Init the api --- api/go.mod | 16 ++++++++++++++++ api/go.sum | 23 +++++++++++++++++++++++ api/main.go | 24 ++++++++++++++++++++++++ shell.nix | 7 +++++++ 4 files changed, 70 insertions(+) create mode 100644 api/go.mod create mode 100644 api/go.sum create mode 100644 api/main.go create mode 100644 shell.nix diff --git a/api/go.mod b/api/go.mod new file mode 100644 index 0000000..31ecd91 --- /dev/null +++ b/api/go.mod @@ -0,0 +1,16 @@ +module github.com/zoriya/vex + +go 1.22.1 + +require ( + github.com/labstack/echo/v4 v4.12.0 // indirect + github.com/labstack/gommon v0.4.2 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasttemplate v1.2.2 // indirect + golang.org/x/crypto v0.22.0 // indirect + golang.org/x/net v0.24.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/text v0.14.0 // indirect +) diff --git a/api/go.sum b/api/go.sum new file mode 100644 index 0000000..f8322c3 --- /dev/null +++ b/api/go.sum @@ -0,0 +1,23 @@ +github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0= +github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM= +github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= +github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= +github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= diff --git a/api/main.go b/api/main.go new file mode 100644 index 0000000..9d92b2b --- /dev/null +++ b/api/main.go @@ -0,0 +1,24 @@ +package api + +import ( + "log" + + "github.com/labstack/echo/v4" +) + +type Handler struct{} + +func (h *Handler) GetEntries(c echo.Context) error { + ret := make([]interface{}, 0) + return c.JSON(200, ret) +} + +func main() { + h := Handler{} + + e := echo.New() + e.GET("/entries", h.GetEntries) + + log.Print("Listening on :1597") + e.Start(":1597") +} diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..12cda20 --- /dev/null +++ b/shell.nix @@ -0,0 +1,7 @@ +{pkgs ? import {}}: + pkgs.mkShell { + packages = with pkgs; [ + go + wgo + ]; + } From 5ab9d9d0e00a06f2ca98fa6c4805c0b1302d447a Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 3 May 2024 22:40:45 +0200 Subject: [PATCH 2/6] Add docker and compose --- .env.example | 9 +++++++++ .gitignore | 1 + api/Dockerfile | 9 +++++++++ api/Dockerfile.dev | 6 ++++++ docker-compose.dev.yml | 29 +++++++++++++++++++++++++++++ docker-compose.yml | 25 +++++++++++++++++++++++++ 6 files changed, 79 insertions(+) create mode 100644 .env.example create mode 100644 .gitignore create mode 100644 api/Dockerfile create mode 100644 api/Dockerfile.dev create mode 100644 docker-compose.dev.yml create mode 100644 docker-compose.yml diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..f14e063 --- /dev/null +++ b/.env.example @@ -0,0 +1,9 @@ +# vi: ft=sh +# shellcheck disable=SC2034 + +# Database things +POSTGRES_USER=vex +POSTGRES_PASSWORD=pass +POSTGRES_DB=vex_db +POSTGRES_SERVER=postgres +POSTGRES_PORT=5432 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c49bd7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.env diff --git a/api/Dockerfile b/api/Dockerfile new file mode 100644 index 0000000..e106ee3 --- /dev/null +++ b/api/Dockerfile @@ -0,0 +1,9 @@ +FROM golang:1.22-alpine +WORKDIR /app +COPY go.mod go.sum ./ +RUN go mod download +COPY . . +RUN go build -o ./vex + +EXPOSE 1597 +CMD ./vex diff --git a/api/Dockerfile.dev b/api/Dockerfile.dev new file mode 100644 index 0000000..f6324c7 --- /dev/null +++ b/api/Dockerfile.dev @@ -0,0 +1,6 @@ +FROM golang:1.22-alpine +RUN go install github.com/bokwoon95/wgo@latest +WORKDIR /app + +EXPOSE 1597 +CMD wgo run . diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 0000000..bccddc8 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,29 @@ +services: + api: + build: + context: ./api + dockerfile: Dockerfile.dev + restart: on-failure + volumes: + - ./api:/app + env_file: + - ./.env + depends_on: + postgres: + condition: service_healthy + + postgres: + image: postgres:15 + restart: on-failure + env_file: + - ./.env + volumes: + - db:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"] + interval: 5s + timeout: 5s + retries: 5 + +volumes: + db: diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..224bc06 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,25 @@ +services: + api: + build: ./api + restart: on-failure + env_file: + - ./.env + depends_on: + postgres: + condition: service_healthy + + postgres: + image: postgres:15 + restart: on-failure + env_file: + - ./.env + volumes: + - db:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"] + interval: 5s + timeout: 5s + retries: 5 + +volumes: + db: From 5ba718be262c1f1ca3430d7235a7795dd5b9441f Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 3 May 2024 22:53:56 +0200 Subject: [PATCH 3/6] Add inital route --- api/go.mod | 5 ++++- api/go.sum | 12 ++++++++++++ api/main.go | 7 +++---- docker-compose.dev.yml | 2 ++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/api/go.mod b/api/go.mod index 31ecd91..362be3e 100644 --- a/api/go.mod +++ b/api/go.mod @@ -2,8 +2,10 @@ module github.com/zoriya/vex go 1.22.1 +require github.com/labstack/echo/v4 v4.12.0 + require ( - github.com/labstack/echo/v4 v4.12.0 // indirect + github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/labstack/gommon v0.4.2 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -13,4 +15,5 @@ require ( golang.org/x/net v0.24.0 // indirect golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect + golang.org/x/time v0.5.0 // indirect ) diff --git a/api/go.sum b/api/go.sum index f8322c3..cadc1f3 100644 --- a/api/go.sum +++ b/api/go.sum @@ -1,3 +1,7 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0= github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM= github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= @@ -7,6 +11,10 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= @@ -21,3 +29,7 @@ golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/api/main.go b/api/main.go index 9d92b2b..8840443 100644 --- a/api/main.go +++ b/api/main.go @@ -1,9 +1,8 @@ -package api +package main import ( - "log" - "github.com/labstack/echo/v4" + "github.com/labstack/echo/v4/middleware" ) type Handler struct{} @@ -17,8 +16,8 @@ func main() { h := Handler{} e := echo.New() + e.Use(middleware.Logger()) e.GET("/entries", h.GetEntries) - log.Print("Listening on :1597") e.Start(":1597") } diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index bccddc8..db7e676 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -8,6 +8,8 @@ services: - ./api:/app env_file: - ./.env + ports: + - 1597:1597 depends_on: postgres: condition: service_healthy From 39ede643a208c92f75a08f0feb36770e58b8664c Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Sat, 4 May 2024 00:05:26 +0200 Subject: [PATCH 4/6] Add db creation script --- .pg_format | 5 +++++ docker-compose.dev.yml | 2 ++ shell.nix | 1 + sql/create.sql | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 .pg_format create mode 100644 sql/create.sql diff --git a/.pg_format b/.pg_format new file mode 100644 index 0000000..882260a --- /dev/null +++ b/.pg_format @@ -0,0 +1,5 @@ +tabs=1 +function-case=1 #lowercase +keyword-case=1 +type-case=1 +no-space-function=1 diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index db7e676..1e38f4d 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -21,6 +21,8 @@ services: - ./.env volumes: - db:/var/lib/postgresql/data + - ./sql/create.sql:/docker-entrypoint-initdb.d/init.sql + command: ["postgres", "-c", "log_statement=all"] healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"] interval: 5s diff --git a/shell.nix b/shell.nix index 12cda20..85e1042 100644 --- a/shell.nix +++ b/shell.nix @@ -3,5 +3,6 @@ packages = with pkgs; [ go wgo + pgformatter ]; } diff --git a/sql/create.sql b/sql/create.sql new file mode 100644 index 0000000..2639a83 --- /dev/null +++ b/sql/create.sql @@ -0,0 +1,36 @@ +create table if not exists users( + id uuid not null primary key, + name text not null, + password varchar(100) not null, + email text not null +); + +create table if not exists feeds( + id uuid not null primary key, + name text not null, + link text not null, + favicon_url text not null, + tags text[] not null, + submitter_id uuid not null references users(id) +); + +create table if not exists entries( + id uuid not null primary key, + feed_id uuid not null references feed(id), + title text not null, + link text not null, + date timestamp with time zone not null, + content text not null, + author text +); + +create table if not exists entries_users( + user_id uuid not null references users(id), + feed_id uuid not null references feeds(id), + is_read bool not null, + is_bookmarked bool not null, + is_read_later bool not null, + is_ignored bool not null, + constraint entries_users_pk primary keys(user_id, feed_id) +); + From 7f9f8f3243ffa003dcdfcdb2f8cdcaf647d3efb1 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Sat, 4 May 2024 00:36:40 +0200 Subject: [PATCH 5/6] Add database connection --- api/go.mod | 1 + api/go.sum | 2 ++ api/main.go | 32 ++++++++++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/api/go.mod b/api/go.mod index 362be3e..d0edfde 100644 --- a/api/go.mod +++ b/api/go.mod @@ -7,6 +7,7 @@ require github.com/labstack/echo/v4 v4.12.0 require ( github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/labstack/gommon v0.4.2 // indirect + github.com/lib/pq v1.10.9 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect diff --git a/api/go.sum b/api/go.sum index cadc1f3..c755d80 100644 --- a/api/go.sum +++ b/api/go.sum @@ -6,6 +6,8 @@ github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+k github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM= github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= diff --git a/api/main.go b/api/main.go index 8840443..3b1c551 100644 --- a/api/main.go +++ b/api/main.go @@ -1,23 +1,51 @@ package main import ( + "database/sql" + "fmt" + "log" + "os" + "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" + _ "github.com/lib/pq" ) -type Handler struct{} +type Handler struct { + database *sql.DB +} func (h *Handler) GetEntries(c echo.Context) error { ret := make([]interface{}, 0) return c.JSON(200, ret) } +func (h *Handler) AddFeed(c echo.Context) error { + ret := make([]interface{}, 0) + return c.JSON(201, ret) +} + func main() { - h := Handler{} + con := fmt.Sprintf( + "postgresql://%v:%v@%v:%v/%v?sslmode=disable", + os.Getenv("POSTGRES_USER"), + os.Getenv("POSTGRES_PASSWORD"), + os.Getenv("POSTGRES_SERVER"), + os.Getenv("POSTGRES_PORT"), + os.Getenv("POSTGRES_DB"), + ) + db, err := sql.Open("postgres", con) + if err != nil { + log.Fatal(err) + } + h := Handler{ + database: db, + } e := echo.New() e.Use(middleware.Logger()) e.GET("/entries", h.GetEntries) + e.POST("/feed", h.AddFeed) e.Start(":1597") } From 0e73e9d2d454900f1e9c8aa6c0f21c110cc7a46c Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Sat, 4 May 2024 01:56:23 +0200 Subject: [PATCH 6/6] Move feeds to cmd package --- api/cmd/feed.go | 21 +++++++++++++++++++++ api/{ => cmd}/main.go | 7 +------ api/feed.go | 12 ++++++++++++ api/go.mod | 7 +++++-- api/go.sum | 2 ++ 5 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 api/cmd/feed.go rename api/{ => cmd}/main.go (84%) create mode 100644 api/feed.go diff --git a/api/cmd/feed.go b/api/cmd/feed.go new file mode 100644 index 0000000..6e4629f --- /dev/null +++ b/api/cmd/feed.go @@ -0,0 +1,21 @@ +package main + +import ( + "github.com/labstack/echo/v4" + "github.com/zoriya/vex" +) + +func (h *Handler) AddFeed(c echo.Context) error { + var feed vex.Feed + err := c.Bind(&feed) + if err != nil { + return err + } + + ret := make([]interface{}, 0) + return c.JSON(201, ret) +} + +func (h *Handler) RegisterFeedsRoutes(e *echo.Echo) { + e.POST("/feed", h.AddFeed) +} diff --git a/api/main.go b/api/cmd/main.go similarity index 84% rename from api/main.go rename to api/cmd/main.go index 3b1c551..178c65f 100644 --- a/api/main.go +++ b/api/cmd/main.go @@ -20,11 +20,6 @@ func (h *Handler) GetEntries(c echo.Context) error { return c.JSON(200, ret) } -func (h *Handler) AddFeed(c echo.Context) error { - ret := make([]interface{}, 0) - return c.JSON(201, ret) -} - func main() { con := fmt.Sprintf( "postgresql://%v:%v@%v:%v/%v?sslmode=disable", @@ -45,7 +40,7 @@ func main() { e := echo.New() e.Use(middleware.Logger()) e.GET("/entries", h.GetEntries) - e.POST("/feed", h.AddFeed) + h.RegisterFeedsRoutes(e) e.Start(":1597") } diff --git a/api/feed.go b/api/feed.go new file mode 100644 index 0000000..7d577ca --- /dev/null +++ b/api/feed.go @@ -0,0 +1,12 @@ +package vex + +import "github.com/google/uuid" + +type Feed struct { + Id uuid.UUID `json:"id"` + Name string `json:"name"` + Link string `json:"link"` + FaviconUrl string `json:"faviconUrl"` + Tags []string `json:"tags"` + SubmitterId uuid.UUID `json:"submitterId"` +} diff --git a/api/go.mod b/api/go.mod index d0edfde..e30be00 100644 --- a/api/go.mod +++ b/api/go.mod @@ -2,12 +2,15 @@ module github.com/zoriya/vex go 1.22.1 -require github.com/labstack/echo/v4 v4.12.0 +require ( + github.com/google/uuid v1.6.0 + github.com/labstack/echo/v4 v4.12.0 + github.com/lib/pq v1.10.9 +) require ( github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/labstack/gommon v0.4.2 // indirect - github.com/lib/pq v1.10.9 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect diff --git a/api/go.sum b/api/go.sum index c755d80..38a485b 100644 --- a/api/go.sum +++ b/api/go.sum @@ -2,6 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0= github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM= github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=