Merge pull request #67 from KnightHacks/development

Updated shared, made optional user fields, fixed integration test
KnightHacks · Dec 17, 2022 · 6568483 · 6568483
2 parents 0006e8d + 3eea93c
commit 6568483
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 136 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/99designs/gqlgen v0.17.13
-	github.com/KnightHacks/knighthacks_shared v0.0.0-20221122100922-bb5380fde900
+	github.com/KnightHacks/knighthacks_shared v0.0.0-20221123184357-0f1e8db71c48
 	github.com/gin-gonic/gin v1.8.1
 	github.com/jackc/pgx/v5 v5.1.1
 	github.com/vektah/gqlparser/v2 v2.4.7

diff --git a/go.sum b/go.sum
@@ -1,8 +1,8 @@
 github.com/99designs/gqlgen v0.17.13 h1:ETUEqvRg5Zvr1lXtpoRdj026fzVay0ZlJPwI33qXLIw=
 github.com/99designs/gqlgen v0.17.13/go.mod h1:w1brbeOdqVyNJI553BGwtwdVcYu1LKeYE1opLWN9RgQ=
 github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/KnightHacks/knighthacks_shared v0.0.0-20221122100922-bb5380fde900 h1:u7Kk62/6IS5f5ROwx+YvEqqZlaVZoBckk/nXHeKqRFE=
-github.com/KnightHacks/knighthacks_shared v0.0.0-20221122100922-bb5380fde900/go.mod h1:CoTeIUwu66fDN5b6Ib6aioECv5Cib7KVPEdrY4jL0g4=
+github.com/KnightHacks/knighthacks_shared v0.0.0-20221123184357-0f1e8db71c48 h1:wOt+RSnfUgSE8YdASFpIgOMNnCChzHa6Iz/3iyN8NUo=
+github.com/KnightHacks/knighthacks_shared v0.0.0-20221123184357-0f1e8db71c48/go.mod h1:CoTeIUwu66fDN5b6Ib6aioECv5Cib7KVPEdrY4jL0g4=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
 github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8=
 github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo=

diff --git a/graph/generated/generated.go b/graph/generated/generated.go
diff --git a/graph/model/models_gen.go b/graph/model/models_gen.go
diff --git a/graph/schema.graphqls b/graph/schema.graphqls
@@ -61,10 +61,10 @@ type User @key(fields:"id") @key(fields:"oAuth { uid provider }") {
     oAuth: OAuth! @goField(forceResolver: true) @hasRole(role: OWNS)
 
     mailingAddress: MailingAddress @goField(forceResolver: true) @hasRole(role: OWNS)
-    mlh: MLHTerms! @goField(forceResolver: true) @hasRole(role: OWNS)
-    shirtSize: ShirtSize! @hasRole(role: OWNS)
+    mlh: MLHTerms @goField(forceResolver: true) @hasRole(role: OWNS)
+    shirtSize: ShirtSize @hasRole(role: OWNS)
     yearsOfExperience: Float @hasRole(role: OWNS)
-    educationInfo: EducationInfo! @hasRole(role: OWNS)
+    educationInfo: EducationInfo @hasRole(role: OWNS)
 
     apiKey: APIKey! @goField(forceResolver: true) @hasRole(role: OWNS)
 }
@@ -188,10 +188,10 @@ input NewUser {
     pronouns: PronounsInput
     age: Int
     mailingAddress: MailingAddressInput
-    mlh: MLHTermsInput!
-    shirtSize: ShirtSize!
+    mlh: MLHTermsInput
+    shirtSize: ShirtSize
     yearsOfExperience: Float
-    educationInfo: EducationInfoInput!
+    educationInfo: EducationInfoInput
     gender: String
     race: [Race!]
 }