feat: fixes main.go script errors; adds route to fetch a user's awards

confesi · Dec 19, 2023 · dceb4a4 · dceb4a4
1 parent fb0875c
commit dceb4a4
Show file tree

Hide file tree

Showing 23 changed files with 289 additions and 144 deletions.
diff --git a/README.md b/README.md
@@ -158,6 +158,7 @@ go run ./scripts/main.go --seed-report-types # Seed report types
 go run ./scripts/main.go --seed-post-categories # Seed post categories
 go run ./scripts/main.go --seed-faculties # Seed faculties
 go run ./scripts/main.go --seed-years-of-study # Seed years of study
+go run ./scripts/main.go --seed-award-types # Seed award types (THIS ORDER MATTERS!!)
 
 ``` 
 

diff --git a/db/models.go b/db/models.go
@@ -511,7 +511,7 @@ type Chat struct {
 }
 
 type AwardType struct {
-	ID          EncryptedID `gorm:"primaryKey;column:id" json:"id"`
+	ID          EncryptedID `gorm:"primaryKey;column:id" json:"-"`
 	Name        string      `gorm:"column:name" json:"name"`
 	Description string      `gorm:"column:description" json:"description"`
 	Icon        string      `gorm:"column:icon" json:"icon"`
@@ -524,7 +524,8 @@ func (AwardType) TableName() string {
 type AwardsTotal struct {
 	ID          EncryptedID `gorm:"primaryKey;column:id" json:"id"`
 	UserID      string      `gorm:"column:user_id" json:"-"`
-	AwardTypeID EncryptedID `gorm:"column:award_type_id" json:"award_type_id"`
+	AwardTypeID EncryptedID `gorm:"column:award_type_id" json:"-"`
+	AwardType   AwardType   `gorm:"foreignKey:AwardTypeID" json:"award_type,omitempty"`
 	Total       uint        `gorm:"column:total" json:"total"`
 }
 

diff --git a/go.mod b/go.mod
@@ -83,6 +83,7 @@ require (
 	github.com/jackc/pgtype v1.14.0
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/joho/godotenv v1.5.1
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect

diff --git a/go.sum b/go.sum
@@ -233,6 +233,8 @@ github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=

diff --git a/handlers/admin/requests.http b/handlers/admin/requests.http
diff --git a/handlers/auth/requests.http b/handlers/auth/requests.http
@@ -15,7 +15,7 @@ Content-Type: application/json
 PATCH http://127.0.0.1:8080/api/v1/auth/update-email
 Content-Type: application/json
 X-AppCheck-Token: kXfeSRgYTnoUztu6MO8FndqiRayoBaJqyDKQmoqvX3V9sZVlep/cm7cP!mgd-B9H
-Authorization: Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImJlNzgyM2VmMDFiZDRkMmI5NjI3NDE2NThkMjA4MDdlZmVlNmRlNWMiLCJ0eXAiOiJKV1QifQ.eyJyb2xlcyI6W10sInN5bmMiOnRydWUsImlzcyI6Imh0dHBzOi8vc2VjdXJldG9rZW4uZ29vZ2xlLmNvbS9jb25mZXNpLXNlcnZlci1kZXYiLCJhdWQiOiJjb25mZXNpLXNlcnZlci1kZXYiLCJhdXRoX3RpbWUiOjE3MDI4NzkyODksInVzZXJfaWQiOiJzQWxoN1p5bkVmYzd6ZUhHU3Y4TWVYamVLWVQyIiwic3ViIjoic0FsaDdaeW5FZmM3emVIR1N2OE1lWGplS1lUMiIsImlhdCI6MTcwMjg3OTI4OSwiZXhwIjoxNzAyODgyODg5LCJlbWFpbCI6Im1hdHRoZXcucmwudHJlbnRAZ21haWwuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsibWF0dGhldy5ybC50cmVudEBnbWFpbC5jb20iXX0sInNpZ25faW5fcHJvdmlkZXIiOiJwYXNzd29yZCJ9fQ.P_s2CffXqU9nuSlU4-J4B5nC6TsMrbR72D9JlmGTHfB0J1yLZ0AKMomZb9DCOOhch96WtrvBr5-AkymLodbo881eIKrDp0mN_1_0fgL7ZPx4ibp1raN2g5K6AGacQrinLhzsK_RYAucC_4bHLwGOJPJmhcDJyn-whRdd5pvF2ORWjlZdfo8aiHT4RBJMwI_7d7oVmBV-E5NVM7vctl9f1dQgWgVaUsDkwClDycZYvO4Ae9N3ftD0fZmz7dXYHoyq6En3wfd1kt7edT84t-Cy7rKlsZyAd5_zxUG__nnP0GCFaY3ImMWg89gD0b_qLIwFqvvpkSrG9c1--A0lz6szPw
+Authorization: Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImJlNzgyM2VmMDFiZDRkMmI5NjI3NDE2NThkMjA4MDdlZmVlNmRlNWMiLCJ0eXAiOiJKV1QifQ.eyJyb2xlcyI6W10sInN5bmMiOnRydWUsImlzcyI6Imh0dHBzOi8vc2VjdXJldG9rZW4uZ29vZ2xlLmNvbS9jb25mZXNpLXNlcnZlci1kZXYiLCJhdWQiOiJjb25mZXNpLXNlcnZlci1kZXYiLCJhdXRoX3RpbWUiOjE3MDI5ODY3MTksInVzZXJfaWQiOiJzQWxoN1p5bkVmYzd6ZUhHU3Y4TWVYamVLWVQyIiwic3ViIjoic0FsaDdaeW5FZmM3emVIR1N2OE1lWGplS1lUMiIsImlhdCI6MTcwMjk4NjcxOSwiZXhwIjoxNzAyOTkwMzE5LCJlbWFpbCI6Im1hdHRoZXcucmwudHJlbnRAZ21haWwuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsibWF0dGhldy5ybC50cmVudEBnbWFpbC5jb20iXX0sInNpZ25faW5fcHJvdmlkZXIiOiJwYXNzd29yZCJ9fQ.OD2gHsh0AVEOMuhGK-GyyaHO2BR9xWRmAu40KzzF5n7AMW3taSVrtwSyFWT3kxnebM2V1g0R2wbFcziixJZ6YLZgF1d9SeJFa2w3M4K2F3C1YwL16sCNAPzrw5uXeoYusrCMZA1LSRrapKzB0K7dMKtKZDostkNMrDePDS0rE3TZtM1L7-mR1SkMRoq-BnSjiXDIpXcLzmzI9NbRgtcxer6NdcqSSLQBwGZWVkPmbTV1_h2aVDFz21r561TE5ROh29YMZ3fgdCxFJoSnJk-oUcsh07H53D4o49r0oeNaFlZJbl_7crkDsgW3RsOwFyGcVMuArnQVPGJzIaqAPvOVwg
 
 {
     "email": "[email protected]"
@@ -25,15 +25,15 @@ Authorization: Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImJlNzgyM2VmMDFiZDRkMmI5NjI3ND
 
 POST http://127.0.0.1:8080/api/v1/auth/resend-verification-email
 Content-Type: application/json
-Authorization: Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImJlNzgyM2VmMDFiZDRkMmI5NjI3NDE2NThkMjA4MDdlZmVlNmRlNWMiLCJ0eXAiOiJKV1QifQ.eyJyb2xlcyI6W10sInN5bmMiOnRydWUsImlzcyI6Imh0dHBzOi8vc2VjdXJldG9rZW4uZ29vZ2xlLmNvbS9jb25mZXNpLXNlcnZlci1kZXYiLCJhdWQiOiJjb25mZXNpLXNlcnZlci1kZXYiLCJhdXRoX3RpbWUiOjE3MDI4NzkyODksInVzZXJfaWQiOiJzQWxoN1p5bkVmYzd6ZUhHU3Y4TWVYamVLWVQyIiwic3ViIjoic0FsaDdaeW5FZmM3emVIR1N2OE1lWGplS1lUMiIsImlhdCI6MTcwMjg3OTI4OSwiZXhwIjoxNzAyODgyODg5LCJlbWFpbCI6Im1hdHRoZXcucmwudHJlbnRAZ21haWwuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsibWF0dGhldy5ybC50cmVudEBnbWFpbC5jb20iXX0sInNpZ25faW5fcHJvdmlkZXIiOiJwYXNzd29yZCJ9fQ.P_s2CffXqU9nuSlU4-J4B5nC6TsMrbR72D9JlmGTHfB0J1yLZ0AKMomZb9DCOOhch96WtrvBr5-AkymLodbo881eIKrDp0mN_1_0fgL7ZPx4ibp1raN2g5K6AGacQrinLhzsK_RYAucC_4bHLwGOJPJmhcDJyn-whRdd5pvF2ORWjlZdfo8aiHT4RBJMwI_7d7oVmBV-E5NVM7vctl9f1dQgWgVaUsDkwClDycZYvO4Ae9N3ftD0fZmz7dXYHoyq6En3wfd1kt7edT84t-Cy7rKlsZyAd5_zxUG__nnP0GCFaY3ImMWg89gD0b_qLIwFqvvpkSrG9c1--A0lz6szPw
+Authorization: Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImJlNzgyM2VmMDFiZDRkMmI5NjI3NDE2NThkMjA4MDdlZmVlNmRlNWMiLCJ0eXAiOiJKV1QifQ.eyJyb2xlcyI6W10sInN5bmMiOnRydWUsImlzcyI6Imh0dHBzOi8vc2VjdXJldG9rZW4uZ29vZ2xlLmNvbS9jb25mZXNpLXNlcnZlci1kZXYiLCJhdWQiOiJjb25mZXNpLXNlcnZlci1kZXYiLCJhdXRoX3RpbWUiOjE3MDI5ODY3MTksInVzZXJfaWQiOiJzQWxoN1p5bkVmYzd6ZUhHU3Y4TWVYamVLWVQyIiwic3ViIjoic0FsaDdaeW5FZmM3emVIR1N2OE1lWGplS1lUMiIsImlhdCI6MTcwMjk4NjcxOSwiZXhwIjoxNzAyOTkwMzE5LCJlbWFpbCI6Im1hdHRoZXcucmwudHJlbnRAZ21haWwuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsibWF0dGhldy5ybC50cmVudEBnbWFpbC5jb20iXX0sInNpZ25faW5fcHJvdmlkZXIiOiJwYXNzd29yZCJ9fQ.OD2gHsh0AVEOMuhGK-GyyaHO2BR9xWRmAu40KzzF5n7AMW3taSVrtwSyFWT3kxnebM2V1g0R2wbFcziixJZ6YLZgF1d9SeJFa2w3M4K2F3C1YwL16sCNAPzrw5uXeoYusrCMZA1LSRrapKzB0K7dMKtKZDostkNMrDePDS0rE3TZtM1L7-mR1SkMRoq-BnSjiXDIpXcLzmzI9NbRgtcxer6NdcqSSLQBwGZWVkPmbTV1_h2aVDFz21r561TE5ROh29YMZ3fgdCxFJoSnJk-oUcsh07H53D4o49r0oeNaFlZJbl_7crkDsgW3RsOwFyGcVMuArnQVPGJzIaqAPvOVwg
 
 {}
 
 ### Send password reset email
 
 POST http://127.0.0.1:8080/api/v1/auth/send-password-reset-email
 Content-Type: application/json
-Authorization: Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImJlNzgyM2VmMDFiZDRkMmI5NjI3NDE2NThkMjA4MDdlZmVlNmRlNWMiLCJ0eXAiOiJKV1QifQ.eyJyb2xlcyI6W10sInN5bmMiOnRydWUsImlzcyI6Imh0dHBzOi8vc2VjdXJldG9rZW4uZ29vZ2xlLmNvbS9jb25mZXNpLXNlcnZlci1kZXYiLCJhdWQiOiJjb25mZXNpLXNlcnZlci1kZXYiLCJhdXRoX3RpbWUiOjE3MDI4NzkyODksInVzZXJfaWQiOiJzQWxoN1p5bkVmYzd6ZUhHU3Y4TWVYamVLWVQyIiwic3ViIjoic0FsaDdaeW5FZmM3emVIR1N2OE1lWGplS1lUMiIsImlhdCI6MTcwMjg3OTI4OSwiZXhwIjoxNzAyODgyODg5LCJlbWFpbCI6Im1hdHRoZXcucmwudHJlbnRAZ21haWwuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsibWF0dGhldy5ybC50cmVudEBnbWFpbC5jb20iXX0sInNpZ25faW5fcHJvdmlkZXIiOiJwYXNzd29yZCJ9fQ.P_s2CffXqU9nuSlU4-J4B5nC6TsMrbR72D9JlmGTHfB0J1yLZ0AKMomZb9DCOOhch96WtrvBr5-AkymLodbo881eIKrDp0mN_1_0fgL7ZPx4ibp1raN2g5K6AGacQrinLhzsK_RYAucC_4bHLwGOJPJmhcDJyn-whRdd5pvF2ORWjlZdfo8aiHT4RBJMwI_7d7oVmBV-E5NVM7vctl9f1dQgWgVaUsDkwClDycZYvO4Ae9N3ftD0fZmz7dXYHoyq6En3wfd1kt7edT84t-Cy7rKlsZyAd5_zxUG__nnP0GCFaY3ImMWg89gD0b_qLIwFqvvpkSrG9c1--A0lz6szPw
+Authorization: Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImJlNzgyM2VmMDFiZDRkMmI5NjI3NDE2NThkMjA4MDdlZmVlNmRlNWMiLCJ0eXAiOiJKV1QifQ.eyJyb2xlcyI6W10sInN5bmMiOnRydWUsImlzcyI6Imh0dHBzOi8vc2VjdXJldG9rZW4uZ29vZ2xlLmNvbS9jb25mZXNpLXNlcnZlci1kZXYiLCJhdWQiOiJjb25mZXNpLXNlcnZlci1kZXYiLCJhdXRoX3RpbWUiOjE3MDI5ODY3MTksInVzZXJfaWQiOiJzQWxoN1p5bkVmYzd6ZUhHU3Y4TWVYamVLWVQyIiwic3ViIjoic0FsaDdaeW5FZmM3emVIR1N2OE1lWGplS1lUMiIsImlhdCI6MTcwMjk4NjcxOSwiZXhwIjoxNzAyOTkwMzE5LCJlbWFpbCI6Im1hdHRoZXcucmwudHJlbnRAZ21haWwuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsibWF0dGhldy5ybC50cmVudEBnbWFpbC5jb20iXX0sInNpZ25faW5fcHJvdmlkZXIiOiJwYXNzd29yZCJ9fQ.OD2gHsh0AVEOMuhGK-GyyaHO2BR9xWRmAu40KzzF5n7AMW3taSVrtwSyFWT3kxnebM2V1g0R2wbFcziixJZ6YLZgF1d9SeJFa2w3M4K2F3C1YwL16sCNAPzrw5uXeoYusrCMZA1LSRrapKzB0K7dMKtKZDostkNMrDePDS0rE3TZtM1L7-mR1SkMRoq-BnSjiXDIpXcLzmzI9NbRgtcxer6NdcqSSLQBwGZWVkPmbTV1_h2aVDFz21r561TE5ROh29YMZ3fgdCxFJoSnJk-oUcsh07H53D4o49r0oeNaFlZJbl_7crkDsgW3RsOwFyGcVMuArnQVPGJzIaqAPvOVwg
 
 {
     "email": "[email protected]"