fix: Read operations

dogukanoksuz · dogukanoksuz · commit d270f6f7483f · 2022-09-15T16:10:40.000+03:00
diff --git a/go.mod b/go.mod
@@ -43,6 +43,7 @@ require (
 	golang.org/x/net v0.0.0-20220907135653-1e95f45603a7 // indirect
 	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -346,6 +346,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 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=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/internal/liman/extension.go b/internal/liman/extension.go
@@ -18,7 +18,7 @@ import (
 )
 
 func GetExtension(extension *models.Extension) (*models.Extension, error) {
-	result := database.Connection().First(&extension)
+	result := database.Connection().Where(&extension).First(&extension)
 
 	if result.Error != nil {
 		return nil, logger.FiberError(fiber.StatusNotFound, "cannot found extension with this id")
diff --git a/internal/liman/server.go b/internal/liman/server.go
@@ -8,7 +8,7 @@ import (
 )
 
 func GetServer(server *models.Server) (*models.Server, error) {
-	result := database.Connection().First(&server)
+	result := database.Connection().Where(&server).First(&server)
 
 	if result.Error != nil {
 		return nil, logger.FiberError(fiber.StatusNotFound, "cannot found server with this id")
diff --git a/internal/liman/user.go b/internal/liman/user.go
@@ -8,7 +8,7 @@ import (
 )
 
 func GetUser(user *models.User) (*models.User, error) {
-	result := database.Connection().First(&user)
+	result := database.Connection().Where(&user).First(&user)
 
 	if result.Error != nil {
 		return nil, logger.FiberError(fiber.StatusNotFound, "cannot found user with this id")

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ require (`
`43`	`43`	`golang.org/x/net v0.0.0-20220907135653-1e95f45603a7 // indirect`
`44`	`44`	`golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect`
`45`	`45`	`gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect`
	`46`	`+ gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect`
`46`	`47`	`)`
`47`	`48`
`48`	`49`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`func GetExtension(extension models.Extension) (models.Extension, error) {`
`21`		`- result := database.Connection().First(&extension)`
	`21`	`+ result := database.Connection().Where(&extension).First(&extension)`
`22`	`22`
`23`	`23`	`if result.Error != nil {`
`24`	`24`	`return nil, logger.FiberError(fiber.StatusNotFound, "cannot found extension with this id")`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func GetServer(server models.Server) (models.Server, error) {`
`11`		`- result := database.Connection().First(&server)`
	`11`	`+ result := database.Connection().Where(&server).First(&server)`
`12`	`12`
`13`	`13`	`if result.Error != nil {`
`14`	`14`	`return nil, logger.FiberError(fiber.StatusNotFound, "cannot found server with this id")`