commit 94de387e197c4b2411639615a6e392a8c5417237 Author: RedokPaw Date: Thu Jul 4 21:20:53 2024 +0300 first commit diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/Zadanie2Project.iml b/.idea/Zadanie2Project.iml new file mode 100644 index 0000000..5e764c4 --- /dev/null +++ b/.idea/Zadanie2Project.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..7033978 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..18fa054 --- /dev/null +++ b/go.mod @@ -0,0 +1,37 @@ +module Zadanie2Project + +go 1.22 + +require ( + github.com/KyleBanks/depth v1.2.1 // indirect + github.com/PuerkitoBio/purell v1.2.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/ghodss/yaml v1.0.0 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/spec v0.21.0 // indirect + github.com/go-openapi/swag v0.23.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.6.0 // indirect + github.com/jackc/puddle/v2 v2.2.1 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/labstack/echo/v4 v4.12.0 // indirect + github.com/labstack/gommon v0.4.2 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/swaggo/echo-swagger v1.4.1 // indirect + github.com/swaggo/files/v2 v2.0.1 // indirect + github.com/swaggo/swag v1.16.3 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasttemplate v1.2.2 // indirect + golang.org/x/crypto v0.24.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sync v0.7.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/text v0.16.0 // indirect + golang.org/x/tools v0.22.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..7ade7c7 --- /dev/null +++ b/go.sum @@ -0,0 +1,88 @@ +github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= +github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= +github.com/PuerkitoBio/purell v1.2.1 h1:QsZ4TjvwiMpat6gBCBxEQI0rcS9ehtkKtSpiUnd9N28= +github.com/PuerkitoBio/purell v1.2.1/go.mod h1:ZwHcC/82TOaovDi//J/804umJFFmbOHPngi8iYYv/Eo= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +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/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= +github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= +github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY= +github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +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-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY= +github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw= +github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= +github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +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/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +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/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/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.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +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/swaggo/echo-swagger v1.4.1 h1:Yf0uPaJWp1uRtDloZALyLnvdBeoEL5Kc7DtnjzO/TUk= +github.com/swaggo/echo-swagger v1.4.1/go.mod h1:C8bSi+9yH2FLZsnhqMZLIZddpUxZdBYuNHbtaS1Hljc= +github.com/swaggo/files/v2 v2.0.1 h1:XCVJO/i/VosCDsJu1YLpdejGsGnBE9deRMpjN4pJLHk= +github.com/swaggo/files/v2 v2.0.1/go.mod h1:24kk2Y9NYEJ5lHuCra6iVwkMjIekMCaFq/0JQj66kyM= +github.com/swaggo/swag v1.16.3 h1:PnCYjPCah8FK4I26l2F/KQ4yz3sILcVUN3cTlBFA9Pg= +github.com/swaggo/swag v1.16.3/go.mod h1:DImHIuOFXKpMFAQjcC7FG4m3Dg4+QuUgUzJmKjI/gRk= +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.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +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/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +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/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.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/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +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= diff --git a/main/main.go b/main/main.go new file mode 100644 index 0000000..bdadbd4 --- /dev/null +++ b/main/main.go @@ -0,0 +1,50 @@ +package main + +import ( + "Zadanie2Project/main/models" + "Zadanie2Project/main/repository" + "github.com/labstack/echo/v4" + echoSwagger "github.com/swaggo/echo-swagger" + "net/http" + "strconv" +) + +const connectionURL = "postgres://tgbot:pass@localhost:5432/vyatsu" + +func main() { + e := echo.New() + e.GET("/programs", getPrograms) + e.GET("/versions", getVersions) + e.GET("/swagger/*", echoSwagger.WrapHandler) + // Start server + e.Logger.Fatal(e.Start(":8080")) +} +func getPrograms(e echo.Context) error { + db, err := repository.New(connectionURL) + offset, err := strconv.Atoi(e.QueryParam("offset")) + limit, err := strconv.Atoi(e.QueryParam("limit")) + var programsDto []models.ProgramDto + if limit == 0 { + limit = 10 + } + programsDto, err = db.GetPrograms(offset, limit) + if err != nil { + return echo.NewHTTPError(http.StatusInternalServerError, err.Error()) + } + return e.JSON(http.StatusOK, programsDto) +} + +func getVersions(e echo.Context) error { + db, err := repository.New(connectionURL) + offset, err := strconv.Atoi(e.QueryParam("offset")) + limit, err := strconv.Atoi(e.QueryParam("limit")) + var versionsDto []models.ProgramVersionsDto + if limit == 0 { + limit = 10 + } + versionsDto, err = db.GetProgramVersions(offset, limit) + if err != nil { + return echo.NewHTTPError(http.StatusInternalServerError, err.Error()) + } + return e.JSON(http.StatusOK, versionsDto) +} diff --git a/main/mappers/ProgramMapper.go b/main/mappers/ProgramMapper.go new file mode 100644 index 0000000..d159a8c --- /dev/null +++ b/main/mappers/ProgramMapper.go @@ -0,0 +1,14 @@ +package mappers + +import "Zadanie2Project/main/models" + +func ConvertProgramToDto(program models.Program) models.ProgramDto { + programDto := models.ProgramDto{ + ID: program.ID, + Name: program.Name, + Publisher: program.Publisher, + Description: program.Description, + URL: program.URL, + } + return programDto +} diff --git a/main/mappers/VersionMapper.go b/main/mappers/VersionMapper.go new file mode 100644 index 0000000..608359f --- /dev/null +++ b/main/mappers/VersionMapper.go @@ -0,0 +1,15 @@ +package mappers + +import "Zadanie2Project/main/models" + +func ConvertProgramVersionToDto(versions models.ProgramVersions) models.ProgramVersionsDto { + versionDto := models.ProgramVersionsDto{ + ProgramID: versions.ProgramID, + Version: versions.Version, + SystemRequirements: versions.SystemRequirements, + URL: versions.URL, + Date: versions.Date, + } + return versionDto + +} diff --git a/main/models/models.go b/main/models/models.go new file mode 100644 index 0000000..7c87155 --- /dev/null +++ b/main/models/models.go @@ -0,0 +1,48 @@ +package models + +type Program struct { + ID int + Publisher string + Name string + CategoryId int + LicenseTypeId int + Description string + URL string +} + +type ProgramDto struct { + ID int + Publisher string + Name string + Category Category + LicenseType License + Description string + URL string +} + +type ProgramVersions struct { + ProgramID int + Version string + SystemRequirements string + LicenseTypeId int + URL string + Date string +} +type ProgramVersionsDto struct { + ProgramID int + Version string + SystemRequirements string + LicenseType License + URL string + Date string +} + +type Category struct { + ID int + Name string +} + +type License struct { + ID int + Name string +} diff --git a/main/repository/pgsql.go b/main/repository/pgsql.go new file mode 100644 index 0000000..f2e642c --- /dev/null +++ b/main/repository/pgsql.go @@ -0,0 +1,20 @@ +package repository + +import ( + "context" + "github.com/jackc/pgx/v5/pgxpool" + "sync" +) + +type PGrepo struct { + mu sync.Mutex + pool *pgxpool.Pool +} + +func New(connStr string) (*PGrepo, error) { + pool, err := pgxpool.New(context.Background(), connStr) + if err != nil { + panic(err) + } + return &PGrepo{mu: sync.Mutex{}, pool: pool}, nil +} diff --git a/main/repository/programs.go b/main/repository/programs.go new file mode 100644 index 0000000..cb45a52 --- /dev/null +++ b/main/repository/programs.go @@ -0,0 +1,106 @@ +package repository + +import ( + "Zadanie2Project/main/mappers" + "Zadanie2Project/main/models" + "context" + "fmt" + "log" +) + +func (repo *PGrepo) GetPrograms(offset int, limit int) ([]models.ProgramDto, error) { + rows, err := repo.pool.Query(context.Background(), "select * from Program LIMIT $1 OFFSET $2", limit, offset) + if err != nil { + log.Fatal(err) + return nil, err + } + defer rows.Close() + var programsDto []models.ProgramDto + for rows.Next() { + program := models.Program{} + err := rows.Scan(&program.ID, &program.Publisher, &program.Name, &program.CategoryId, &program.LicenseTypeId, + &program.Description, &program.URL) + category, err := repo.GetCategoryWithId(program.CategoryId) + license, err := repo.GetLicenseWithId(program.LicenseTypeId) + programDto := mappers.ConvertProgramToDto(program) + programDto.Category = category + programDto.LicenseType = license + + if err != nil { + fmt.Println(err) + continue + } + + programsDto = append(programsDto, programDto) + } + return programsDto, nil +} +func (repo *PGrepo) GetEmployeesWithFilterByPosition(offset int, limit int, position string) ([]models.Program, error) { + rows, err := repo.pool.Query(context.Background(), "select * from Program where position = $3 LIMIT $1 OFFSET $2", limit, offset, position) + if err != nil { + log.Fatal(err) + return nil, err + } + defer rows.Close() + var programs []models.Program + for rows.Next() { + program := models.Program{} + err := rows.Scan(&program.ID, &program.Publisher, &program.Name, &program.CategoryId, &program.LicenseTypeId, + &program.Description, &program.URL) + if err != nil { + fmt.Println(err) + continue + } + programs = append(programs, program) + } + return programs, nil +} +func (repo *PGrepo) GetProgramVersions(offset int, limit int) ([]models.ProgramVersionsDto, error) { + rows, err := repo.pool.Query(context.Background(), "select * from ProgramVersions LIMIT $1 OFFSET $2", limit, offset) + if err != nil { + log.Fatal(err) + return nil, err + } + defer rows.Close() + var programVersions []models.ProgramVersionsDto + for rows.Next() { + version := models.ProgramVersions{} + err := rows.Scan(&version.ProgramID, &version.Version, &version.SystemRequirements, &version.LicenseTypeId, &version.URL, + &version.Date) + versionDto := mappers.ConvertProgramVersionToDto(version) + license, err := repo.GetLicenseWithId(version.LicenseTypeId) + versionDto.LicenseType = license + if err != nil { + fmt.Println(err) + continue + } + programVersions = append(programVersions, versionDto) + } + return programVersions, nil +} +func (repo *PGrepo) GetLicenseWithId(id int) (models.License, error) { + rows, err := repo.pool.Query(context.Background(), "select * from License where id = $1", id) + if err != nil { + panic(err) + } + defer rows.Close() + var license models.License + err = rows.Scan(&license.ID, &license.Name) + if err != nil { + fmt.Println(err) + } + return license, nil +} +func (repo *PGrepo) GetCategoryWithId(id int) (models.Category, error) { + rows, err := repo.pool.Query(context.Background(), "select * from Category where id = $1", id) + if err != nil { + panic(err) + } + defer rows.Close() + var category models.Category + err = rows.Scan(&category.ID, &category.Name) + if err != nil { + fmt.Println(err) + } + return category, nil +}