Skip to content

Commit

Permalink
Merge pull request #56 from KnightHacks/development
Browse files Browse the repository at this point in the history
implemented new information required for users
  • Loading branch information
LockedThread authored Nov 21, 2022
2 parents ab3f414 + 805e033 commit 2295b7d
Show file tree
Hide file tree
Showing 17 changed files with 7,203 additions and 2,389 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18 as build-env
FROM golang:1.19-alpine as build-env

WORKDIR /go/src/app
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/KnightHacks/knighthacks_users

go 1.18
go 1.19

require (
github.com/99designs/gqlgen v0.17.13
github.com/KnightHacks/knighthacks_shared v0.0.0-20221029020239-4248bfa6f0dd
github.com/KnightHacks/knighthacks_shared v0.0.0-20221121010043-cf2a1397df2e
github.com/gin-gonic/gin v1.8.1
github.com/jackc/pgx/v4 v4.16.1
github.com/vektah/gqlparser/v2 v2.4.7
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ github.com/99designs/gqlgen v0.17.13 h1:ETUEqvRg5Zvr1lXtpoRdj026fzVay0ZlJPwI33qX
github.com/99designs/gqlgen v0.17.13/go.mod h1:w1brbeOdqVyNJI553BGwtwdVcYu1LKeYE1opLWN9RgQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/KnightHacks/knighthacks_shared v0.0.0-20220701074430-690b99b0cd25 h1:m1DwqDMsPCyubE/NEg4EUoUsUNXzbWUZMS2sJZ5XUxs=
github.com/KnightHacks/knighthacks_shared v0.0.0-20220701074430-690b99b0cd25/go.mod h1:fEEUyCM7yJM0NCAtgRzY3aUf5sPqqMvIK3N9+yNOb2o=
github.com/KnightHacks/knighthacks_shared v0.0.0-20221029020239-4248bfa6f0dd h1:y1d0uyNpLbtLjru/ybdfWwmSfz9jDHh9/tk7cDpaGP0=
github.com/KnightHacks/knighthacks_shared v0.0.0-20221029020239-4248bfa6f0dd/go.mod h1:W6x/SycHYHMTE51Mo1MZeGQJUTJGME5LF3hdPFdGp4c=
github.com/KnightHacks/knighthacks_shared v0.0.0-20221120025925-541d81e10069 h1:yvEO67PhIBcBO/Yn3Mh2iUPSgVC0az/T3ls7IRg3ZRk=
github.com/KnightHacks/knighthacks_shared v0.0.0-20221120025925-541d81e10069/go.mod h1:1PTL6VJL44UN/BdfFyxT8GsAa46W2+9C5dDRnfqKJYA=
github.com/KnightHacks/knighthacks_shared v0.0.0-20221121010043-cf2a1397df2e h1:2s45geYfGUlA0P+OQC9BB05WBKCaooB+TStnGXC6u/c=
github.com/KnightHacks/knighthacks_shared v0.0.0-20221121010043-cf2a1397df2e/go.mod h1:1PTL6VJL44UN/BdfFyxT8GsAa46W2+9C5dDRnfqKJYA=
github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8=
Expand Down
2 changes: 2 additions & 0 deletions graph/entity.resolvers.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ import (
"github.com/KnightHacks/knighthacks_users/graph/model"
)

// FindUserByID is the resolver for the findUserByID field.
func (r *entityResolver) FindUserByID(ctx context.Context, id string) (*model.User, error) {
user, err := r.Resolver.Repository.GetUserByID(ctx, id)
return user, err
}

// FindUserByOAuthUIDAndOAuthProvider is the resolver for the findUserByOAuthUIDAndOAuthProvider field.
func (r *entityResolver) FindUserByOAuthUIDAndOAuthProvider(ctx context.Context, oAuthUID string, oAuthProvider models.Provider) (*model.User, error) {
user, err := r.Resolver.Repository.GetUserByOAuthUID(ctx, oAuthUID, oAuthProvider)
return user, err
Expand Down
Loading

0 comments on commit 2295b7d

Please sign in to comment.