diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 95add43..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.env b/.env index ec3739f..ac27f3a 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ GOOSE_DRIVER=postgres -GOOSE_DBSTRING=postgres://admin:admin@localhost:5433/blog +GOOSE_DBSTRING=postgres://postgres:password@localhost:5432/blog GOOSE_MIGRATION_DIR=./migrations diff --git a/internal/repo/.gitignore b/.gitignore similarity index 96% rename from internal/repo/.gitignore rename to .gitignore index 51a45e1..190c15b 100644 --- a/internal/repo/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ go.work.sum # --- PostgreSQL data --- /db_data/ +.DS_Store \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5a04d43 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM golang:1.24-alpine + +WORKDIR /app + +COPY go.mod go.sum ./ + +RUN go mod download + +COPY . . + +RUN go build -o main . + +EXPOSE 8080 + +CMD ["./main"] diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..cf35cb2 --- /dev/null +++ b/TODO.md @@ -0,0 +1,11 @@ +# Задачи на проект + +[ ] Придумать эндпоинты для полноценной работы блога (Update post, delete post, update comment...) +[ ] Реализовать их +[ ] Выставить там где надо мидлвари +[ ] Не забыть в слое сервиса например при обновлении поста проверять что пост принадлежит юзеру, который сделал запрос + + +### Общее +1. [ ] Добавить возможность отвечать на другие комментарии +2. [ ] Добавить Register и Log in и Refresh diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..2a0d552 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,30 @@ +services: + api: + build: + context: . + dockerfile: Dockerfile + ports: + - "8080:8088" + container_name: blog-api + depends_on: + - redis + - postgres + + postgres: + image: postgres:15 + container_name: blog-postgres + environment: + POSTGRES_DB: blog + POSTGRES_USER: postgres + POSTGRES_PASSWORD: password + volumes: + - postgres_data:/var/lib/postgresql/data + + redis: + image: redis:7-alpine + container_name: blog-redis + restart: unless-stopped + command: redis-server --appendonly yes + +volumes: + postgres_data: \ No newline at end of file diff --git a/docs/endpoints.md b/docs/endpoints.md new file mode 100644 index 0000000..337b350 --- /dev/null +++ b/docs/endpoints.md @@ -0,0 +1,10 @@ +| Status | HTTP Method | Endpoint | Method Name | Description | +|--------|-------------|----------------------------------------|---------------------|-------------------------------------------| +| ✅ | POST | `/users/` | CreateUser | Создание нового пользователя | +| ✅ | GET | `/users/:id/` | GetUser | Получение информации о пользователе по ID | +| ✅ | GET | `/users/:id/posts/` | GetPostsByUserID | Получение списка всех постов пользователя | +| ✅ | POST | `/posts/` | CreatePost | Создание нового поста | +| ✅ | GET | `/posts/` | GetPosts | Получение списка всех постов | +| ✅ | GET | `/posts/:id/` | GetPost | Получение информации о посте по ID | +| ✅ | POST | `/posts/:id/comments?reply_to=231e119` | CreateComment | Создание комментария к посту | +| ⏳ | GET | `/posts/:id/comments/` | GetCommentsByPostID | Получение всех комментариев к посту | diff --git a/go.mod b/go.mod index 09ed4bd..93c3070 100644 --- a/go.mod +++ b/go.mod @@ -3,40 +3,37 @@ module github.com/berduk-dev/blog go 1.24.5 require ( + github.com/gin-contrib/cors v1.7.6 github.com/gin-gonic/gin v1.10.1 - github.com/go-redis/redis v6.15.9+incompatible github.com/jackc/pgx/v5 v5.7.5 + golang.org/x/crypto v0.41.0 ) require ( - github.com/bytedance/sonic v1.11.6 // indirect - github.com/bytedance/sonic/loader v0.1.1 // indirect - github.com/cloudwego/base64x v0.1.4 // indirect - github.com/cloudwego/iasm v0.2.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.3 // indirect - github.com/gin-contrib/sse v0.1.0 // indirect + github.com/bytedance/sonic v1.13.3 // indirect + github.com/bytedance/sonic/loader v0.2.4 // indirect + github.com/cloudwego/base64x v0.1.5 // indirect + github.com/gabriel-vasile/mimetype v1.4.9 // indirect + github.com/gin-contrib/sse v1.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.20.0 // indirect - github.com/goccy/go-json v0.10.2 // indirect - github.com/google/go-cmp v0.7.0 // indirect + github.com/go-playground/validator/v10 v10.26.0 // indirect + github.com/go-redis/redis v6.15.9+incompatible // indirect + github.com/goccy/go-json v0.10.5 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/klauspost/cpuid/v2 v2.2.10 // indirect github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/onsi/ginkgo v1.16.5 // indirect - github.com/onsi/gomega v1.38.2 // indirect - github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.2.12 // indirect - golang.org/x/arch v0.8.0 // indirect - golang.org/x/crypto v0.41.0 // indirect + github.com/ugorji/go/codec v1.3.0 // indirect + golang.org/x/arch v0.18.0 // indirect golang.org/x/net v0.43.0 // indirect golang.org/x/sys v0.35.0 // indirect golang.org/x/text v0.28.0 // indirect diff --git a/go.sum b/go.sum index a8b8ae6..55a07bb 100644 --- a/go.sum +++ b/go.sum @@ -1,22 +1,21 @@ -github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= -github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= -github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= +github.com/bytedance/sonic v1.13.3 h1:MS8gmaH16Gtirygw7jV91pDCN33NyMrPbN7qiYhEsF0= +github.com/bytedance/sonic v1.13.3/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= -github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= -github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= -github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= +github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY= +github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= +github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= +github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= -github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= -github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY= +github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok= +github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY= +github.com/gin-contrib/cors v1.7.6/go.mod h1:Ulcl+xN4jel9t1Ry8vqph23a60FwH9xVLd+3ykmTjOk= +github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w= +github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ= github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= @@ -25,27 +24,15 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= -github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k= +github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= +github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= @@ -57,8 +44,8 @@ github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFr github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= -github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= +github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= @@ -73,19 +60,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A= -github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k= -github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= -github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= +github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= 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/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= @@ -93,87 +69,36 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= -github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= -golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA= +github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= +golang.org/x/arch v0.18.0 h1:WN9poc33zL4AzGxqf8VtpKUnGvMi8O9lhNyBMF/85qc= +golang.org/x/arch v0.18.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk= golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A= google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= -rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/index.html b/index.html new file mode 100644 index 0000000..0fbb808 --- /dev/null +++ b/index.html @@ -0,0 +1,725 @@ + + + + + + Блог + + + +
+ +
+ +
+ + +
+
+

Последние посты

+ +
+
Загрузка постов...
+ +
+
+
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/internal/cache/cache.go b/internal/cache/cache.go deleted file mode 100644 index 08bf029..0000000 --- a/internal/cache/cache.go +++ /dev/null @@ -1 +0,0 @@ -package cache diff --git a/internal/cache/sessions.go b/internal/cache/sessions.go new file mode 100644 index 0000000..1437b05 --- /dev/null +++ b/internal/cache/sessions.go @@ -0,0 +1,50 @@ +package cache + +import ( + "context" + "errors" + "fmt" + "strconv" + "time" + + "github.com/go-redis/redis" +) + +const SessionTtlHours = time.Hour * 24 * 7 + +type SessionsCache struct { + rdb *redis.Client +} + +func New(rdb *redis.Client) SessionsCache { + return SessionsCache{ + rdb: rdb, + } +} + +func (c *SessionsCache) StoreSession(ctx context.Context, userID int, sessionID string) error { + cmd := c.rdb.Set(fmt.Sprintf("session_%s", sessionID), userID, SessionTtlHours) + if cmd.Err() != nil { + return fmt.Errorf("error rdb.Set: %w", cmd.Err()) + } + + return nil +} + +func (c *SessionsCache) GetUserIDBySessionID(ctx context.Context, sessionID string) (bool, int, error) { + cmd := c.rdb.Get(fmt.Sprintf("session_%s", sessionID)) + if cmd.Err() != nil { + if errors.Is(cmd.Err(), redis.Nil) { + return false, 0, nil + } + return false, 0, fmt.Errorf("error rdb.Get: %w", cmd.Err()) + } + + userIdRaw := cmd.Val() + userID, err := strconv.Atoi(userIdRaw) + if err != nil { + return false, 0, fmt.Errorf("error strconv.Atoi: %w", err) + } + + return true, userID, nil +} diff --git a/internal/handler/dto/dto.go b/internal/handler/dto/dto.go new file mode 100644 index 0000000..bf08313 --- /dev/null +++ b/internal/handler/dto/dto.go @@ -0,0 +1,32 @@ +package dto + +import "time" + +type CreatePostReq struct { + Title string `json:"title"` + Body string `json:"body"` +} + +type CreateCommentReq struct { + Body string `json:"body"` +} + +type LoginReq struct { + Email string `json:"email"` + Password string `json:"password"` +} + +type LoginResp struct { + ID int `json:"id"` + Name string `json:"name"` + Email string `json:"email"` + IsAdmin bool `json:"is_admin"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` +} + +type CreateUserReq struct { + Name string `json:"name"` + Password string `json:"password"` + Email string `json:"email"` +} diff --git a/internal/handler/handler.go b/internal/handler/handler.go index abeebd1..e15cb6a 100644 --- a/internal/handler/handler.go +++ b/internal/handler/handler.go @@ -1 +1,147 @@ package handler + +import ( + "context" + "log" + "net/http" + "strconv" + + handlerDto "github.com/berduk-dev/blog/internal/handler/dto" + "github.com/berduk-dev/blog/internal/model" + + "github.com/gin-gonic/gin" +) + +type Service interface { + CreatePost(ctx context.Context, userID int, post handlerDto.CreatePostReq) error + CreateComment(ctx context.Context, userID int, PostID int, comment handlerDto.CreateCommentReq) error + GetPost(ctx context.Context, postID int) (model.Post, error) + GetCommentsByPostID(ctx context.Context, postID int) ([]model.Comment, error) + GetPostsByUserID(ctx context.Context, userID int) ([]model.Post, error) + GetPosts(ctx context.Context) ([]model.Post, error) +} + +type Handler struct { + service Service +} + +func New(service Service) Handler { + return Handler{ + service: service, + } +} + +func (h *Handler) CreatePost(c *gin.Context) { + user := c.Value("user").(model.User) + + var req handlerDto.CreatePostReq + err := c.ShouldBindJSON(&req) + if err != nil { + c.JSON(http.StatusBadRequest, "У вас невалидный запрос") + log.Println("error ShouldBindJSON:", err) + return + } + + err = h.service.CreatePost(c, user.ID, req) + if err != nil { + c.JSON(http.StatusInternalServerError, "Произошла ошибка! Попробуйте позже") + log.Println("error service.CreatePost:", err) + return + } + + c.Status(http.StatusOK) +} + +func (h *Handler) CreateComment(c *gin.Context) { + user := c.Value("user").(model.User) + + var req handlerDto.CreateCommentReq + + err := c.ShouldBindJSON(&req) + if err != nil { + c.JSON(http.StatusBadRequest, "У вас невалидный запрос") + log.Println("error ShouldBindJSON:", err) + return + } + + postID, err := strconv.Atoi(c.Param("id")) + if err != nil { + c.JSON(http.StatusBadRequest, "У вас невалидный запрос") + log.Println("error CreateComment, strconv.Atoi:", err) + return + } + + err = h.service.CreateComment(c, user.ID, postID, req) + if err != nil { + c.JSON(http.StatusInternalServerError, "Произошла ошибка! Попробуйте позже") + log.Println("error service.CreateComment:", err) + return + } + + c.Status(http.StatusOK) +} + +func (h *Handler) GetPostsByUserID(c *gin.Context) { + userID, err := strconv.Atoi(c.Param("id")) + if err != nil { + c.JSON(http.StatusBadRequest, "У вас невалидный запрос") + log.Println("error GetPostsByUserID, strconv.Atoi:", err) + return + } + + posts, err := h.service.GetPostsByUserID(c, userID) + if err != nil { + c.JSON(http.StatusInternalServerError, "Произошла ошибка! Попробуйте позже") + log.Println("error service.GetPostsByUserID:", err) + return + } + + c.JSON(http.StatusOK, posts) +} + +func (h *Handler) GetPosts(c *gin.Context) { + posts, err := h.service.GetPosts(c) + if err != nil { + c.JSON(http.StatusInternalServerError, "Произошла ошибка! Попробуйте позже") + log.Println("error service.GetPosts:", err) + return + } + + c.JSON(http.StatusOK, posts) +} + +func (h *Handler) GetPost(c *gin.Context) { + postID, err := strconv.Atoi(c.Param("id")) + if err != nil { + c.JSON(http.StatusBadRequest, "У вас невалидный запрос") + log.Println("error GetPostsByUserID, strconv.Atoi:", err) + return + } + + post, err := h.service.GetPost(c, postID) + if err != nil { + c.JSON(http.StatusInternalServerError, "Произошла ошибка! Попробуйте позже") + log.Println("error service.GetPosts:", err) + return + } + + c.JSON(http.StatusOK, post) +} + +func (h *Handler) GetCommentsByPostID(c *gin.Context) { + postID, err := strconv.Atoi(c.Param("id")) + if err != nil { + c.JSON(http.StatusBadRequest, "У вас невалидный запрос") + log.Println("error GetCommentsByPostID, strconv.Atoi:", err) + return + } + + comments, err := h.service.GetCommentsByPostID(c, postID) + if err != nil { + c.JSON(http.StatusInternalServerError, "Произошла ошибка! Попробуйте позже") + log.Println("error service.GetCommentsByPostID:", err) + return + } + + c.JSON(http.StatusOK, comments) +} diff --git a/internal/handler/users.go b/internal/handler/users.go new file mode 100644 index 0000000..4860eca --- /dev/null +++ b/internal/handler/users.go @@ -0,0 +1,132 @@ +package handler + +import ( + "errors" + "log" + "net/http" + "strconv" + "time" + + "github.com/berduk-dev/blog/internal/model" + "github.com/berduk-dev/blog/internal/model/errs" + "github.com/gin-gonic/gin" +) + +func (h *Handler) Register(c *gin.Context) { + var req model.CreateUserReq + + err := c.ShouldBindJSON(&req) + if err != nil { + c.JSON(http.StatusBadRequest, "У вас невалидный запрос") + log.Println("error ShouldBindJSON:", err) + return + } + + err = h.service.CreateUser(c, req) + if err != nil { + if errors.Is(err, errs.ErrorEmailAlreadyExists) { + c.JSON(http.StatusInternalServerError, "Эта почта уже используется") + return + } + + c.JSON(http.StatusInternalServerError, "Произошла ошибка! Попробуйте позже") + log.Println("error service.CreateUser:", err) + return + } + + c.Status(http.StatusOK) +} + +func (h *Handler) Login(c *gin.Context) { + var req model.LoginReq + + err := c.ShouldBindJSON(&req) + if err != nil { + c.JSON(http.StatusBadRequest, "У вас невалидный запрос") + log.Println("error ShouldBindJSON:", err) + return + } + + user, err := h.service.AuthenticateUser(c, req.Email, req.Password) + if err != nil { + c.AbortWithStatus(http.StatusUnauthorized) + return + } + + sessionID, err := h.service.CreateSession(c, user.ID) + if err != nil { + log.Println("error service.CreateSession:", err) + c.JSON(http.StatusInternalServerError, "Ошибка. Попробуйте позже") + return + } + + c.SetSameSite(http.SameSiteStrictMode) + c.SetCookie( + "session_id", // name + sessionID, // value + int(24*time.Hour.Seconds()), // maxAge + "/", // path + "", // domain + false, // secure (только HTTPS) + false, // httpOnly (недоступен для JS) + ) + + c.JSON(200, model.LoginResp{ + ID: user.ID, + Name: user.Name, + Email: user.Email, + IsAdmin: user.IsAdmin, + CreatedAt: user.CreatedAt, + UpdatedAt: user.UpdatedAt, + }) +} + +func (h *Handler) GetCurrentUser(c *gin.Context) { + user := c.Value("user").(model.User) + c.JSON(http.StatusOK, model.LoginResp{ + ID: user.ID, + Name: user.Name, + Email: user.Email, + IsAdmin: user.IsAdmin, + CreatedAt: user.CreatedAt, + UpdatedAt: user.UpdatedAt, + }) +} + +func (h *Handler) GetUser(c *gin.Context) { + userID, err := strconv.Atoi(c.Param("id")) + if err != nil { + c.JSON(http.StatusBadRequest, "У вас невалидный запрос") + log.Println("error GetUser, strconv.Atoi:", err) + return + } + + user, err := h.service.GetUser(c, userID) + if err != nil { + c.JSON(http.StatusInternalServerError, "Произошла ошибка! Попробуйте позже") + log.Println("error service.GetUser:", err) + return + } + + c.JSON(http.StatusOK, user) +} + +func (h *Handler) CreateUser(c *gin.Context) { + var req model.CreateUserReq + + err := c.ShouldBindJSON(&req) + if err != nil { + c.JSON(http.StatusBadRequest, "У вас невалидный запрос") + log.Println("error ShouldBindJSON:", err) + return + } + + err = h.service.CreateUser(c, req) + if err != nil { + c.JSON(http.StatusInternalServerError, "Произошла ошибка! Попробуйте позже") + log.Println("error service.CreateUser:", err) + return + } + + c.Status(http.StatusOK) +} diff --git a/internal/manager/manager.go b/internal/manager/manager.go deleted file mode 100644 index 5d04392..0000000 --- a/internal/manager/manager.go +++ /dev/null @@ -1 +0,0 @@ -package manager diff --git a/internal/middlewares/middlewares.go b/internal/middlewares/middlewares.go new file mode 100644 index 0000000..93cc0f5 --- /dev/null +++ b/internal/middlewares/middlewares.go @@ -0,0 +1,53 @@ +package middlewares + +import ( + "context" + "github.com/berduk-dev/blog/internal/model" + "log" + "net/http" + + "github.com/gin-gonic/gin" +) + +type UserService interface { + GetUserIDBySessionID(ctx context.Context, sessionID string) (bool, int, error) + GetUser(ctx context.Context, userID int) (model.User, error) +} +type Middleware struct { + service UserService +} + +func New(service UserService) Middleware { + return Middleware{ + service: service, + } +} + +func (m *Middleware) SessionAuthMiddleware(c *gin.Context) { + sessionID, err := c.Cookie("session_id") + if err != nil { + c.AbortWithStatus(http.StatusUnauthorized) + return + } + + found, userID, err := m.service.GetUserIDBySessionID(c, sessionID) + if err != nil { + log.Println("error service.GetUserIDBySessionID:", err) + c.AbortWithStatus(http.StatusUnauthorized) + return + } + + if !found { + c.AbortWithStatus(http.StatusUnauthorized) + return + } + + user, err := m.service.GetUser(c, userID) + if err != nil { + log.Println("error service.GetUser:", err) + c.AbortWithStatus(http.StatusUnauthorized) + return + } + + c.Set("user", user) +} diff --git a/internal/model/errs/errors.go b/internal/model/errs/errors.go new file mode 100644 index 0000000..2ca4e28 --- /dev/null +++ b/internal/model/errs/errors.go @@ -0,0 +1,5 @@ +package errs + +import "errors" + +var ErrorEmailAlreadyExists = errors.New("email уже существует") diff --git a/internal/model/model.go b/internal/model/model.go new file mode 100644 index 0000000..97f3a25 --- /dev/null +++ b/internal/model/model.go @@ -0,0 +1,32 @@ +package model + +import "time" + +type User struct { + ID int `json:"id"` + Name string `json:"name"` + Email string `json:"email"` + HashedPassword string + IsAdmin bool `json:"is_admin"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` +} + +type Post struct { + ID int `json:"id"` + UserID int `json:"user_id"` + Title string `json:"title"` + Body string `json:"body"` + Views int `json:"views"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` +} + +type Comment struct { + ID int `json:"id"` + PostID int `json:"post_id"` + UserID int `json:"user_id"` + Body string `json:"body"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` +} diff --git a/internal/repo/repo.go b/internal/repo/repo.go index dd9deba..58a85e8 100644 --- a/internal/repo/repo.go +++ b/internal/repo/repo.go @@ -2,128 +2,180 @@ package repo import ( "context" + "errors" "fmt" + serviceDto "github.com/berduk-dev/blog/internal/service/dto" + "log" + "strings" + + "github.com/berduk-dev/blog/internal/model" + "github.com/berduk-dev/blog/internal/model/errs" "github.com/jackc/pgx/v5" - "time" + "github.com/jackc/pgx/v5/pgconn" ) type Repository struct { db *pgx.Conn } -func New(db *pgx.Conn) Repository { - return Repository{ +func New(db *pgx.Conn) *Repository { + return &Repository{ db: db, } } -type User struct { - userID int - name string - email string - isAdmin bool - createdAt time.Time - updatedAt time.Time +type UpdateUser struct { + Name *string + Email *string + IsAdmin *bool } -type CreateUserRequest struct { - name string - email string +type UpdatePost struct { + Title int } -type Post struct { - postID int - userID int - title string - body string - views int - createdAt time.Time - updatedAt time.Time +type UpdateComment struct { + Body string } -type CreatePostRequest struct { - userID int - title string - body string -} +func (r *Repository) GetUser(ctx context.Context, userID int) (model.User, error) { + var user model.User + + err := r.db.QueryRow(ctx, "SELECT id, name, email, is_admin, created_at, updated_at FROM users WHERE id = $1", userID).Scan(&user.ID, &user.Name, &user.Email, &user.IsAdmin, &user.CreatedAt, &user.UpdatedAt) + if err != nil { + return model.User{}, fmt.Errorf("error GetUser QueryRow: %w", err) + } -type Comment struct { - commentID int - postID int - userID int - body string - createdAt time.Time - updatedAt time.Time + return user, nil } -type CreateCommentRequest struct { - postID int - userID int - body string +func (r *Repository) GetPost(ctx context.Context, postID int) (model.Post, error) { + var post model.Post + + err := r.db.QueryRow(ctx, + `SELECT id, + user_id, + title, + body, + views, + created_at, + updated_at FROM posts WHERE id = $1`, postID, + ).Scan(&post.ID, &post.UserID, &post.Title, &post.Body, &post.Views, &post.CreatedAt, &post.UpdatedAt) + if err != nil { + return model.Post{}, fmt.Errorf("error GetPost QueryRow: %w", err) + } + + return post, nil } -func (r *Repository) GetUserByID(ctx context.Context, userID int) (*User, error) { - var user User +func (r *Repository) GetComment(ctx context.Context, commentID int) (model.Comment, error) { + var comment model.Comment - rows, err := r.db.Query(ctx, "SELECT name, email, is_admin, created_at, updated_at FROM users WHERE user_id = $1", userID) + err := r.db.QueryRow(ctx, + "SELECT id, user_id, post_id, body, created_at, updated_at FROM posts WHERE id = $1", + commentID).Scan(&comment.ID, &comment.UserID, &comment.PostID, &comment.Body, &comment.CreatedAt, &comment.UpdatedAt) if err != nil { - return nil, fmt.Errorf("error User r.db.Query: %w", err) + return model.Comment{}, fmt.Errorf("error GetComment QueryRow: %w", err) } + return comment, nil +} + +func (r *Repository) GetCommentsByPostID(ctx context.Context, postID int) ([]model.Comment, error) { + rows, err := r.db.Query(ctx, "SELECT id, post_id, user_id, body, created_at, updated_at FROM comments WHERE post_id = $1", postID) + defer rows.Close() + + var comments []model.Comment for rows.Next() { - err := rows.Scan(&user.name, &user.email, &user.isAdmin, &user.createdAt, &user.updatedAt) + var comment model.Comment + err = rows.Scan(&comment.ID, &comment.PostID, &comment.UserID, &comment.Body, &comment.CreatedAt, &comment.UpdatedAt) if err != nil { - return nil, fmt.Errorf("error User Scan: %w", err) + return nil, err } + comments = append(comments, comment) + } + + if err = rows.Err(); err != nil { + return nil, err } - return &user, nil -} -func (r *Repository) GetPostByID(ctx context.Context, postID int) (*Post, error) { - var post Post + return comments, nil +} - rows, err := r.db.Query(ctx, "SELECT user_id, title, body, views, created_at, updated_at FROM posts WHERE user_id = $1", postID) +func (r *Repository) GetPostsByUserID(ctx context.Context, userID int) ([]model.Post, error) { + rows, err := r.db.Query(ctx, ` + SELECT id, user_id, title, body, views, created_at, updated_at + FROM posts WHERE user_id = $1 + ORDER BY created_at desc`, + userID) if err != nil { - return nil, fmt.Errorf("error User r.db.Query: %w", err) + return nil, fmt.Errorf("query failed: %w", err) } + defer rows.Close() + var posts []model.Post for rows.Next() { - err := rows.Scan(&post.userID, &post.title, &post.body, &post.views, &post.createdAt, &post.updatedAt) + var post model.Post + err = rows.Scan(&post.ID, &post.UserID, &post.Title, &post.Body, &post.Views, &post.CreatedAt, &post.UpdatedAt) if err != nil { - return nil, fmt.Errorf("error User Scan: %w", err) + return nil, err } + posts = append(posts, post) + } + + if err = rows.Err(); err != nil { + return nil, err } - return &post, nil -} -func (r *Repository) GetCommentByID(ctx context.Context, commentID int) (*Comment, error) { - var comment Comment + return posts, nil +} - rows, err := r.db.Query(ctx, "SELECT user_id, post_id, body, created_at, updated_at FROM posts WHERE user_id = $1", commentID) +func (r *Repository) GetPosts(ctx context.Context) ([]model.Post, error) { + rows, err := r.db.Query(ctx, ` + SELECT id, user_id, title, body, views, created_at, updated_at + FROM posts + ORDER BY created_at DESC + `) if err != nil { - return nil, fmt.Errorf("error User r.db.Query: %w", err) + return nil, fmt.Errorf("query failed: %w", err) } + defer rows.Close() + var posts []model.Post for rows.Next() { - err := rows.Scan(&comment.userID, &comment.postID, &comment.body, &comment.createdAt, &comment.updatedAt) + var post model.Post + err = rows.Scan(&post.ID, &post.UserID, &post.Title, &post.Body, &post.Views, &post.CreatedAt, &post.UpdatedAt) if err != nil { - return nil, fmt.Errorf("error User Scan: %w", err) + return nil, fmt.Errorf("scan failed: %w", err) } + posts = append(posts, post) } - return &comment, nil + + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("rows iteration failed: %w", err) + } + + return posts, nil } -func (r *Repository) CreateUser(ctx context.Context, params CreateUserRequest) error { - _, err := r.db.Exec(ctx, "INSERT INTO users (name, email) VALUES ($1, $2)", params.name, params.email) +func (r *Repository) CreateUser(ctx context.Context, user serviceDto.CreateUserRequest) error { + _, err := r.db.Exec(ctx, "INSERT INTO users (name, email, hashed_password, is_admin) VALUES ($1, $2, $3, $4)", user.Name, user.Email, user.HashedPassword, user.IsAdmin) if err != nil { + log.Println("repo.CreateUser: ", err) + var pgErr *pgconn.PgError + if errors.As(err, &pgErr) && pgErr.Code == "23505" { // unique_violation + if strings.Contains(pgErr.ConstraintName, "email") { + return errs.ErrorEmailAlreadyExists + } + } return fmt.Errorf("error CreateUser Exec: %w", err) } return nil } -func (r *Repository) CreatePost(ctx context.Context, params CreatePostRequest) error { - _, err := r.db.Exec(ctx, "INSERT INTO posts (user_id, title, body) VALUES ($1, $2)", params.userID, params.title, params.body) +func (r *Repository) CreatePost(ctx context.Context, params serviceDto.CreatePostRequest) error { + _, err := r.db.Exec(ctx, "INSERT INTO posts (user_id, title, body) VALUES ($1, $2, $3)", params.UserID, params.Title, params.Body) if err != nil { return fmt.Errorf("error CreatePost Exec: %w", err) } @@ -131,11 +183,122 @@ func (r *Repository) CreatePost(ctx context.Context, params CreatePostRequest) e return nil } -func (r *Repository) CreateComment(ctx context.Context, params CreateCommentRequest) error { - _, err := r.db.Exec(ctx, "INSERT INTO posts (user_id, title, body) VALUES ($1, $2)", params.userID, params.postID, params.body) +func (r *Repository) CreateComment(ctx context.Context, params serviceDto.CreateCommentRequest) error { + _, err := r.db.Exec(ctx, "INSERT INTO comments (user_id, post_id, body) VALUES ($1, $2, $3)", params.UserID, params.PostID, params.Body) if err != nil { return fmt.Errorf("error CreateComment Exec: %w", err) } return nil } + +func (r *Repository) DeleteUser(ctx context.Context, userID int) error { + _, err := r.db.Exec(ctx, "DELETE FROM users WHERE id = $1", userID) + if err != nil { + return fmt.Errorf("error DeleteUser Exec: %w", err) + } + + return nil +} + +func (r *Repository) DeletePost(ctx context.Context, postID int) error { + _, err := r.db.Exec(ctx, "DELETE FROM posts WHERE id = $1", postID) + if err != nil { + return fmt.Errorf("error DeletePost Exec: %w", err) + } + + return nil +} + +func (r *Repository) DeleteComment(ctx context.Context, commentID int) error { + _, err := r.db.Exec(ctx, "DELETE FROM comments WHERE id = $1", commentID) + if err != nil { + return fmt.Errorf("error DeleteComment Exec: %w", err) + } + + return nil +} + +func (r *Repository) UpdateUser(ctx context.Context, userID int, user UpdateUser) (model.User, error) { + updatedUser := model.User{} + err := r.db.QueryRow( + ctx, + `UPDATE users + set name=COALESCE($1, name), + email=COALESCE($2, email), + is_admin=COALESCE($3, is_admin), + updated_at=now() WHERE id=$4 + returning id, + name, + email, + is_admin, + created_at, + updated_at`, + user.Name, + user.Email, + user.IsAdmin, + userID, + ).Scan(updatedUser.ID, updatedUser.Name, updatedUser.Email, updatedUser.IsAdmin, updatedUser.CreatedAt, updatedUser.UpdatedAt) + if err != nil { + return model.User{}, fmt.Errorf("error UpdateUser: %w", err) + } + + return updatedUser, nil +} + +func (r *Repository) UpdatePost() { + +} + +func (r *Repository) UpdateComment(ctx context.Context, commentID int, comment UpdateComment) (model.Comment, error) { + var updatedComment model.Comment + err := r.db.QueryRow( + ctx, + `UPDATE comments + set body=$1 WHERE id=$2 + returning id, + post_id, + user_id + body + created_at + updated_at`, + comment.Body, + commentID, + ).Scan(updatedComment.ID, updatedComment.PostID, updatedComment.UserID, updatedComment.Body, updatedComment.CreatedAt, updatedComment.UpdatedAt) + if err != nil { + return model.Comment{}, fmt.Errorf("error UpdateComment: %w", err) + } + + return updatedComment, nil +} + +func (r *Repository) GetUserByEmail(ctx context.Context, email string) (model.User, error) { + var user model.User + + err := r.db.QueryRow( + ctx, + `SELECT + id, + name, + hashed_password, + email, + is_admin, + created_at, + updated_at + FROM users + WHERE email = $1`, + email).Scan( + &user.ID, + &user.Name, + &user.HashedPassword, + &user.Email, + &user.IsAdmin, + &user.CreatedAt, + &user.UpdatedAt, + ) + if err != nil { + return model.User{}, fmt.Errorf("error GetUserByEmail Scan: %w", err) + } + + return user, nil +} diff --git a/internal/service/dto/dto.go b/internal/service/dto/dto.go new file mode 100644 index 0000000..b0cc264 --- /dev/null +++ b/internal/service/dto/dto.go @@ -0,0 +1,20 @@ +package dto + +type CreatePostRequest struct { + UserID int + Title string + Body string +} + +type CreateCommentRequest struct { + PostID int + UserID int + Body string +} + +type CreateUserRequest struct { + Name string + Email string + HashedPassword string + IsAdmin bool +} diff --git a/internal/service/service.go b/internal/service/service.go index 6d43c33..cb0f7da 100644 --- a/internal/service/service.go +++ b/internal/service/service.go @@ -1 +1,141 @@ package service + +import ( + "context" + "fmt" + handlerDto "github.com/berduk-dev/blog/internal/handler/dto" + "golang.org/x/crypto/bcrypt" + + "github.com/berduk-dev/blog/internal/cache" + "github.com/berduk-dev/blog/internal/model" + serviceDto "github.com/berduk-dev/blog/internal/service/dto" +) + +type Repository interface { + CreatePost(ctx context.Context, params serviceDto.CreatePostRequest) error + GetPost(ctx context.Context, postID int) (model.Post, error) + GetPosts(ctx context.Context) ([]model.Post, error) + GetPostsByUserID(ctx context.Context, userID int) ([]model.Post, error) + + CreateComment(ctx context.Context, params serviceDto.CreateCommentRequest) error + GetCommentsByPostID(ctx context.Context, postID int) ([]model.Comment, error) + + CreateUser(ctx context.Context, user serviceDto.CreateUserRequest) error + GetUser(ctx context.Context, userID int) (model.User, error) + GetUserByEmail(ctx context.Context, email string) (model.User, error) +} + +type Service struct { + repo Repository + sessionsManger cache.SessionsCache +} + +func New(repo Repository, sessionsManger cache.SessionsCache) *Service { + return &Service{ + repo: repo, + sessionsManger: sessionsManger, + } +} + +func (s *Service) CreateUser(ctx context.Context, user handlerDto.CreateUserReq) error { + hashedPassword, err := bcrypt.GenerateFromPassword([]byte(user.Password), bcrypt.DefaultCost) + if err != nil { + return fmt.Errorf("error bcrypt.GenerateFromPassword: %w", err) + } + + err = s.repo.CreateUser(ctx, serviceDto.CreateUserRequest{ + Name: user.Name, + HashedPassword: string(hashedPassword), + Email: user.Email, + }) + if err != nil { + return fmt.Errorf("error repo.CreateUser: %w", err) // "error repo.CreateUser: email уже существует" + } + + return nil +} + +func (s *Service) CreatePost(ctx context.Context, userID int, post handlerDto.CreatePostReq) error { + err := s.repo.CreatePost(ctx, serviceDto.CreatePostRequest{ + UserID: userID, + Title: post.Title, + Body: post.Body, + }) + if err != nil { + return fmt.Errorf("error repo.CreatePost: %w", err) + } + + return nil +} + +func (s *Service) CreateComment(ctx context.Context, userID int, PostID int, comment handlerDto.CreateCommentReq) error { + err := s.repo.CreateComment(ctx, serviceDto.CreateCommentRequest{ + UserID: userID, + PostID: PostID, + Body: comment.Body, + }) + if err != nil { + return fmt.Errorf("error repo.CreateComment: %w", err) + } + + return nil +} + +func (s *Service) GetUser(ctx context.Context, userID int) (model.User, error) { + user, err := s.repo.GetUser(ctx, userID) + if err != nil { + return model.User{}, fmt.Errorf("error repo.GetUser: %w", err) + } + + return user, nil +} + +func (s *Service) AuthenticateUser(ctx context.Context, email string, password string) (model.User, error) { + user, err := s.repo.GetUserByEmail(ctx, email) + if err != nil { + return model.User{}, fmt.Errorf("error repo.GetUserByEmail: %w", err) + } + + err = bcrypt.CompareHashAndPassword([]byte(user.HashedPassword), []byte(password)) + if err != nil { + return model.User{}, fmt.Errorf("invalid email or password") // TODO: вынести ошибку в пакет + } + + return user, nil +} + +func (s *Service) GetPostsByUserID(ctx context.Context, userID int) ([]model.Post, error) { + posts, err := s.repo.GetPostsByUserID(ctx, userID) + if err != nil { + return nil, fmt.Errorf("error repo.GetPostsByUserID: %w", err) + } + + return posts, nil +} + +func (s *Service) GetPosts(ctx context.Context) ([]model.Post, error) { + posts, err := s.repo.GetPosts(ctx) + if err != nil { + return nil, fmt.Errorf("error repo.GetPosts: %w", err) + } + + return posts, nil +} + +func (s *Service) GetPost(ctx context.Context, postID int) (model.Post, error) { + posts, err := s.repo.GetPost(ctx, postID) + if err != nil { + return model.Post{}, fmt.Errorf("error repo.GetPost: %w", err) + } + + return posts, nil +} + +func (s *Service) GetCommentsByPostID(ctx context.Context, postID int) ([]model.Comment, error) { + comments, err := s.repo.GetCommentsByPostID(ctx, postID) + if err != nil { + return nil, fmt.Errorf("error repo.GetCommentsByPostID: %w", err) + } + + return comments, nil +} diff --git a/internal/service/sessions.go b/internal/service/sessions.go new file mode 100644 index 0000000..143d2eb --- /dev/null +++ b/internal/service/sessions.go @@ -0,0 +1,30 @@ +package service + +import ( + "context" + "crypto/rand" + "encoding/base64" + "fmt" +) + +func (s *Service) CreateSession(ctx context.Context, userID int) (string, error) { + b := make([]byte, 32) + rand.Read(b) + sessionID := base64.URLEncoding.EncodeToString(b)[:32] + + err := s.sessionsManger.StoreSession(ctx, userID, sessionID) + if err != nil { + return "", fmt.Errorf("error sessionsManger.StoreSession: %w", err) + } + + return sessionID, nil +} + +func (s *Service) GetUserIDBySessionID(ctx context.Context, sessionID string) (bool, int, error) { + ok, userID, err := s.sessionsManger.GetUserIDBySessionID(ctx, sessionID) + if err != nil { + return false, 0, fmt.Errorf("error sessionsManger.GetUserIDBySessionID: %w", err) + } + + return ok, userID, nil +} diff --git a/main.go b/main.go index 06ab7d0..bfcffde 100644 --- a/main.go +++ b/main.go @@ -1 +1,71 @@ package main + +import ( + "context" + "time" + + "log" + + "github.com/berduk-dev/blog/internal/cache" + "github.com/berduk-dev/blog/internal/handler" + "github.com/berduk-dev/blog/internal/middlewares" + "github.com/berduk-dev/blog/internal/repo" + "github.com/berduk-dev/blog/internal/service" + "github.com/gin-contrib/cors" + + "github.com/gin-gonic/gin" + "github.com/go-redis/redis" + "github.com/jackc/pgx/v5" +) + +func main() { + rdb := redis.NewClient(&redis.Options{ + Addr: "redis:6379", + Password: "", + DB: 0, + }) + + _, err := rdb.Ping().Result() + if err != nil { + log.Fatalf("Ошибка подключения к Redis: %v", err) + } + + connString := "postgres://postgres:password@postgres:5432/blog" + conn, err := pgx.Connect(context.Background(), connString) + if err != nil { + log.Fatal("Ошибка при подключении к БД: ", err) + } + + r := gin.Default() + + sessionsCache := cache.New(rdb) + blogRepository := repo.New(conn) + blogService := service.New(blogRepository, sessionsCache) + blogHandler := handler.New(blogService) + blogMiddlewares := middlewares.New(blogService) + + r.Use(cors.New(cors.Config{ + AllowOriginFunc: func(origin string) bool { + return true + }, + AllowMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"}, + AllowHeaders: []string{"Origin", "Content-Type", "Accept", "Authorization", "X-Requested-With", "User-ID"}, + ExposeHeaders: []string{"Content-Length"}, + AllowCredentials: true, + MaxAge: 12 * time.Hour, + })) + + r.POST("/register/", blogHandler.Register) + r.POST("/login/", blogHandler.Login) + // r.POST("/users/", blogHandler.CreateUser) + r.GET("/users/:id/", blogHandler.GetUser) + r.GET("/users/me", blogMiddlewares.SessionAuthMiddleware, blogHandler.GetCurrentUser) + r.GET("/users/:id/posts/", blogHandler.GetPostsByUserID) + r.POST("/posts/", blogMiddlewares.SessionAuthMiddleware, blogHandler.CreatePost) + r.GET("/posts/", blogHandler.GetPosts) + r.GET("/posts/:id/", blogHandler.GetPost) + r.POST("/posts/:id/comments/", blogMiddlewares.SessionAuthMiddleware, blogHandler.CreateComment) + r.GET("/posts/:id/comments/", blogHandler.GetCommentsByPostID) + + r.Run(":8088") +} diff --git a/migrations/20250901111339_init.sql b/migrations/20250901111339_init.sql index cec5d71..fd9e525 100644 --- a/migrations/20250901111339_init.sql +++ b/migrations/20250901111339_init.sql @@ -14,6 +14,7 @@ create table users ( id bigserial primary key, name text not null, email text not null, + is_admin boolean not null default false, created_at timestamp not null default now(), updated_at timestamp not null default now() diff --git a/migrations/20250909170255_add_email_unique_constraint.sql b/migrations/20250909170255_add_email_unique_constraint.sql new file mode 100644 index 0000000..a12bdae --- /dev/null +++ b/migrations/20250909170255_add_email_unique_constraint.sql @@ -0,0 +1,9 @@ +-- +goose Up +-- +goose StatementBegin +ALTER TABLE users + add constraint users_email_key unique (email); +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd diff --git a/migrations/20250909170513_add_hashed_password_column.sql b/migrations/20250909170513_add_hashed_password_column.sql new file mode 100644 index 0000000..f0f920f --- /dev/null +++ b/migrations/20250909170513_add_hashed_password_column.sql @@ -0,0 +1,9 @@ +-- +goose Up +-- +goose StatementBegin +ALTER TABLE users + ADD COLUMN hashed_password TEXT NOT NULL; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +-- +goose StatementEnd