Alexey Kim 1 an în urmă
părinte
comite
5c00115146
6 a modificat fișierele cu 12 adăugiri și 40 ștergeri
  1. 1 0
      devops/prod-schema.graphql
  2. 3 3
      go.mod
  3. 6 0
      go.sum
  4. 1 1
      graph/auth
  5. 1 1
      graph/sports
  6. 0 35
      model/page_info.go

+ 1 - 0
devops/prod-schema.graphql

@@ -167,6 +167,7 @@ type Mutation
 {
   Signup(credentials: Credentials!): String
   Login(credentials: Credentials!): AccessTokenResponse
+  Logout(token: String!): Boolean!
   RefreshToken(token: String!): AccessTokenResponse
 }
 

+ 3 - 3
go.mod

@@ -3,11 +3,11 @@ module git.beejay.kim/Craft/Api
 go 1.20
 
 require (
-	github.com/ClickHouse/clickhouse-go/v2 v2.13.0
+	github.com/ClickHouse/clickhouse-go/v2 v2.13.3
 	github.com/Nerzal/gocloak/v13 v13.8.0
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/golang-jwt/jwt/v4 v4.5.0
-	github.com/google/uuid v1.3.0
+	github.com/google/uuid v1.3.1
 	github.com/hashicorp/golang-lru/v2 v2.0.5
 	github.com/labstack/echo-jwt/v4 v4.2.0
 	github.com/labstack/echo/v4 v4.11.1
@@ -18,7 +18,7 @@ require (
 )
 
 require (
-	github.com/ClickHouse/ch-go v0.58.0 // indirect
+	github.com/ClickHouse/ch-go v0.58.2 // indirect
 	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/go-faster/city v1.0.1 // indirect

+ 6 - 0
go.sum

@@ -1,7 +1,11 @@
 github.com/ClickHouse/ch-go v0.58.0 h1:SwCH/WWJnwHnQdehiQsmraC13+uMpkexPR61c2Jj5Qo=
 github.com/ClickHouse/ch-go v0.58.0/go.mod h1:P0YtetDdxICIC7IuRM9Qv/TMi83W0mRgBVQ9wcpt+4Y=
+github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0=
+github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw=
 github.com/ClickHouse/clickhouse-go/v2 v2.13.0 h1:oP1OlTQIbQKKLnqLzyDhiyNFvN3pbOtM+e/3qdexG9k=
 github.com/ClickHouse/clickhouse-go/v2 v2.13.0/go.mod h1:xyL0De2K54/n+HGsdtPuyYJq76wefafaHfGUXTDEq/0=
+github.com/ClickHouse/clickhouse-go/v2 v2.13.3 h1:/esk41SjVLIDQs2rkOmRKXJ1FIFArIJiX6sYG0DUavE=
+github.com/ClickHouse/clickhouse-go/v2 v2.13.3/go.mod h1:yoCB//XLqbyqaYvXzdbIdmMafOSomU3erh3r06NLCZU=
 github.com/Nerzal/gocloak/v13 v13.8.0 h1:7s9cK8X3vy8OIic+pG4POE9vGy02tSHkMhvWXv0P2m8=
 github.com/Nerzal/gocloak/v13 v13.8.0/go.mod h1:rRBtEdh5N0+JlZZEsrfZcB2sRMZWbgSxI2EIv9jpJp4=
 github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
@@ -33,6 +37,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvHgwfx2Vm4=
 github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=

+ 1 - 1
graph/auth

@@ -1 +1 @@
-Subproject commit ef5be4b6e626aaa26a160f1b594d35f08ff67f7e
+Subproject commit 4f01dc7e557118f91bb541cebc33d4b5164fef4c

+ 1 - 1
graph/sports

@@ -1 +1 @@
-Subproject commit 2ffe1ad28332a09a9fdbd8b02fad5196b6a60b6f
+Subproject commit 8381aa67bc3208f93bccc6e17ed644980ef8b30f

+ 0 - 35
model/page_info.go

@@ -1,10 +1,5 @@
 package model
 
-import (
-	"git.beejay.kim/Craft/Api/connection"
-	"github.com/samber/lo"
-)
-
 //easyjson:json
 type PageInfo struct {
 	Total           int     `json:"total"`
@@ -13,33 +8,3 @@ type PageInfo struct {
 	HasNextPage     bool    `json:"has_next_page"`
 	HasPreviousPage bool    `json:"has_previous_page"`
 }
-
-func (pi *PageInfo) SetTotal(nodes []connection.Cursor) {
-	pi.Total = len(nodes)
-	pi.Invalidate(nodes)
-}
-
-func (pi *PageInfo) Invalidate(nodes []connection.Cursor) {
-	l := len(nodes)
-	if l < 1 {
-		pi.HasPreviousPage = pi.StartCursor != nil
-		pi.HasNextPage = pi.EndCursor != nil
-		pi.StartCursor = nil
-		pi.EndCursor = nil
-	} else {
-		if pi.StartCursor != nil {
-			pi.HasPreviousPage = !(*pi.StartCursor == nodes[0].Cursor())
-		} else {
-			pi.HasPreviousPage = false
-		}
-
-		if pi.EndCursor != nil {
-			pi.HasNextPage = !(*pi.EndCursor == nodes[l-1].Cursor())
-		} else {
-			pi.HasNextPage = false
-		}
-
-		pi.StartCursor = lo.ToPtr(nodes[0].Cursor())
-		pi.EndCursor = lo.ToPtr(nodes[l-1].Cursor())
-	}
-}