Skip to content

Commit

Permalink
added funcs
Browse files Browse the repository at this point in the history
  • Loading branch information
Zorynix committed Mar 16, 2024
1 parent 1081c13 commit 3ab3e15
Show file tree
Hide file tree
Showing 11 changed files with 338 additions and 66 deletions.
7 changes: 0 additions & 7 deletions dto/actors.go

This file was deleted.

7 changes: 0 additions & 7 deletions dto/movies.go

This file was deleted.

8 changes: 8 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,25 @@ require gorm.io/gorm v1.25.7

require (
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/go-pg/pg/v10 v10.12.0 // indirect
github.com/go-pg/zerochecker v0.2.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v5 v5.4.3 // indirect
github.com/klauspost/compress v1.17.6 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/vmihailenco/bufpool v0.1.11 // indirect
github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
github.com/vmihailenco/tagparser v0.1.2 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
mellium.im/sasl v0.3.1 // indirect
)

require (
Expand Down
23 changes: 23 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1
github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/go-pg/pg/v10 v10.12.0 h1:rBmfDDHTN7FQW0OemYmcn5UuBy6wkYWgh/Oqt1OBEB8=
github.com/go-pg/pg/v10 v10.12.0/go.mod h1:USA08CdIasAn0F6wC1nBf5nQhMHewVQodWoH89RPXaI=
github.com/go-pg/zerochecker v0.2.0 h1:pp7f72c3DobMWOb2ErtZsnrPaSvHd2W4o9//8HtF4mU=
github.com/go-pg/zerochecker v0.2.0/go.mod h1:NJZ4wKL0NmTtz0GKCoJ8kym6Xn/EQzXRl2OnAe7MmDo=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
Expand All @@ -17,6 +21,9 @@ github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI=
github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
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=
Expand All @@ -30,11 +37,23 @@ github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
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.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo=
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs=
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/fasthttp v1.52.0 h1:wqBQpxH71XW0e2g+Og4dzQM8pk34aFYlA1Ga8db7gU0=
github.com/valyala/fasthttp v1.52.0/go.mod h1:hf5C4QnVMkNXMspnsUlfM3WitlgYflyhHYoKol/szxQ=
github.com/vmihailenco/bufpool v0.1.11 h1:gOq2WmBrq0i2yW5QJ16ykccQ4wH9UyEsgLm6czKAd94=
github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5H/UxrkA5jxTQ=
github.com/vmihailenco/msgpack/v5 v5.3.4 h1:qMKAwOV+meBw2Y8k9cVwAy7qErtYCwBzZ2ellBfvnqc=
github.com/vmihailenco/msgpack/v5 v5.3.4/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc=
github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
Expand All @@ -51,8 +70,12 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gorm.io/driver/postgres v1.5.7 h1:8ptbNJTDbEmhdr62uReG5BGkdQyeasu/FZHxI0IMGnM=
gorm.io/driver/postgres v1.5.7/go.mod h1:3e019WlBaYI5o5LIdNV+LyxCMNtLOQETBXL2h4chKpA=
gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A=
gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
mellium.im/sasl v0.3.1 h1:wE0LW6g7U83vhvxjC1IY8DnXM+EU095yeo8XClvCdfo=
mellium.im/sasl v0.3.1/go.mod h1:xm59PUYpZHhgQ9ZqoJ5QaCqzWMi8IeS49dhp6plPCzw=
2 changes: 1 addition & 1 deletion models/actor.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ type Actor struct {
Name string `gorm:"type:varchar(255);not null"`
Gender string `gorm:"type:char(1)"`
DateOfBirth string
Movies []*Movie `gorm:"many2many:actor_movies;foreignKey:ID;joinForeignKey:ActorID;References:ID;joinReferences:MovieID"`
Movies []*Movie `gorm:"many2many:actormovies;"`
}
6 changes: 2 additions & 4 deletions models/movie.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package models

import "time"

type Movie struct {
ID int `gorm:"primary_key"`
Title string `gorm:"type:varchar(150);not null"`
Description string `gorm:"type:varchar(1000)"`
ReleaseDate time.Time
ReleaseDate string
Rating float64 `gorm:"type:decimal(2,1)"`
Actors []*Actor `gorm:"many2many:actor_movies;foreignKey:ID;joinForeignKey:MovieID;References:ID;joinReferences:ActorID"`
Actors []*Actor `gorm:"many2many:actormovies;"`
}
35 changes: 17 additions & 18 deletions postgresql/schema/v001-initial.sql
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
DROP SCHEMA IF EXISTS vk CASCADE;
DROP TABLE IF EXISTS vk.actors;
DROP TABLE IF EXISTS vk.movies;
DROP TABLE IF EXISTS vk.actor_movie;

CREATE SCHEMA IF NOT EXISTS vk;

CREATE TABLE vk.actors (
actor_id SERIAL PRIMARY KEY,
id SERIAL PRIMARY KEY,
name VARCHAR(255) NOT NULL,
gender CHAR(1),
date_of_birth DATE,
CHECK (gender IN ('M', 'F'))
);

CREATE TABLE vk.movies (
movie_id SERIAL PRIMARY KEY,
title VARCHAR(150) NOT NULL CHECK (LENGTH(title) >= 1 AND LENGTH(title) <= 150),
id SERIAL PRIMARY KEY,
title VARCHAR(150) NOT NULL CHECK (
LENGTH(title) >= 1
AND LENGTH(title) <= 150
),
description VARCHAR(1000),
release_date DATE,
rating DECIMAL(2, 1) CHECK (rating >= 1 AND rating <= 10)
);

CREATE TABLE vk.actor_movie (
actor_id INT NOT NULL,
movie_id INT NOT NULL,
PRIMARY KEY (actor_id, movie_id),
FOREIGN KEY (actor_id) REFERENCES vk.actors (actor_id) ON DELETE CASCADE,
FOREIGN KEY (movie_id) REFERENCES vk.movies (movie_id) ON DELETE CASCADE
rating DECIMAL(2, 1) CHECK (
rating >= 1
AND rating <= 10
)
);
CREATE TABLE vk.actor_movies (
actor_name VARCHAR(255) NOT NULL,
movie_title VARCHAR(150) NOT NULL,
PRIMARY KEY (actor_name, movie_title),
CONSTRAINT fk_actor_name FOREIGN KEY (actor_name) REFERENCES vk.actors(name) ON DELETE CASCADE,
CONSTRAINT fk_movie_title FOREIGN KEY (movie_title) REFERENCES vk.movies(title) ON DELETE CASCADE
);
8 changes: 4 additions & 4 deletions routes/v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (

func (router *Router) V1Routes() {
http.HandleFunc("/v1/actor-add", router.ActorAddRoute)
http.HandleFunc("/v1/actor-edit", router.ActorEditRoute)
http.HandleFunc("/v1/actor-edit/", router.ActorEditRoute)
http.HandleFunc("/v1/actor-list", router.ActorListRoute)
http.HandleFunc("/v1/actor-delete", router.ActorDeleteRoute)
http.HandleFunc("/v1/actor-delete/", router.ActorDeleteRoute)
http.HandleFunc("/v1/movie-add", router.MovieAddRoute)
http.HandleFunc("/v1/movie-edit", router.MovieEditRoute)
http.HandleFunc("/v1/movie-edit/", router.MovieEditRoute)
http.HandleFunc("/v1/movie-find", router.MovieFindRoute)
http.HandleFunc("/v1/movie-list", router.MovieListRoute)
http.HandleFunc("/v1/movie-delete", router.MovieDeleteRoute)
http.HandleFunc("/v1/movie-delete/", router.MovieDeleteRoute)
}
Loading

0 comments on commit 3ab3e15

Please sign in to comment.