Skip to content

Commit 65c1607

Browse files
committed
Add notificationText to achivements
1 parent 49e2ea1 commit 65c1607

17 files changed

+380
-65
lines changed

backend/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ help: ## Display this help message
66
generate: ## Generate GraphQL code
77
@echo "Generating GraphQL API..."
88
@go run github.com/99designs/gqlgen generate --config gqlgen.yml
9+
@sqlc generate
910

1011
migrate: ## Run database migrations
1112
@echo "Running migrations..."
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-- +goose Up
2+
ALTER TABLE achievements ADD COLUMN notification_text TEXT NOT NULL DEFAULT '';
3+
ALTER TABLE achievement_translations ADD COLUMN notification_text TEXT;
4+
5+
-- +goose Down
6+
ALTER TABLE achievements DROP COLUMN notification_text;
7+
ALTER TABLE achievement_translations DROP COLUMN notification_text;

backend/internal/database/queries/achievements.sql

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ SELECT
88
a.name,
99
a.description_pending,
1010
a.description_completed,
11+
a.notification_text,
1112
a.image_pending,
1213
a.image_completed,
1314
a.points,
@@ -46,6 +47,7 @@ SELECT
4647
a.name,
4748
a.description_pending,
4849
a.description_completed,
50+
a.notification_text,
4951
a.image_pending,
5052
a.image_completed,
5153
a.points,
@@ -73,6 +75,7 @@ SELECT
7375
a.name,
7476
a.description_pending,
7577
a.description_completed,
78+
a.notification_text,
7679
a.image_pending,
7780
a.image_completed,
7881
a.points,
@@ -136,6 +139,7 @@ INSERT INTO achievements (
136139
name,
137140
description_pending,
138141
description_completed,
142+
notification_text,
139143
image_pending,
140144
image_completed,
141145
points,
@@ -149,6 +153,7 @@ INSERT INTO achievements (
149153
@name::text,
150154
@description_pending::text,
151155
@description_completed::text,
156+
@notification_text::text,
152157
@image_pending::text,
153158
@image_completed::text,
154159
@points::int,
@@ -191,6 +196,7 @@ SET
191196
name = CASE WHEN sqlc.narg('name')::text IS NOT NULL THEN sqlc.narg('name')::text ELSE name END,
192197
description_pending = CASE WHEN sqlc.narg('description_pending')::text IS NOT NULL THEN sqlc.narg('description_pending')::text ELSE description_pending END,
193198
description_completed = CASE WHEN sqlc.narg('description_completed')::text IS NOT NULL THEN sqlc.narg('description_completed')::text ELSE description_completed END,
199+
notification_text = CASE WHEN sqlc.narg('notification_text')::text IS NOT NULL THEN sqlc.narg('notification_text')::text ELSE notification_text END,
194200
image_pending = CASE WHEN sqlc.narg('image_pending')::text IS NOT NULL THEN sqlc.narg('image_pending')::text ELSE image_pending END,
195201
image_completed = CASE WHEN sqlc.narg('image_completed')::text IS NOT NULL THEN sqlc.narg('image_completed')::text ELSE image_completed END,
196202
event_id = CASE WHEN sqlc.narg('event_id')::text IS NOT NULL THEN sqlc.narg('event_id')::text ELSE event_id END,
@@ -336,6 +342,7 @@ SELECT DISTINCT
336342
a.name,
337343
a.description_pending,
338344
a.description_completed,
345+
a.notification_text,
339346
a.image_pending,
340347
a.image_completed,
341348
a.points,

backend/internal/database/queries/translations.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ WHERE challenge_id = ANY(@entity_ids::text[])
3838
AND language_code = @language_code::text;
3939

4040
-- name: GetAchievementTranslationsByIDs :many
41-
SELECT achievement_id, language_code, name, description_pending, description_completed
41+
SELECT achievement_id, language_code, name, description_pending, description_completed, notification_text
4242
FROM achievement_translations
4343
WHERE achievement_id = ANY(@entity_ids::text[])
4444
AND language_code = @language_code::text;

backend/internal/database/sqlc/achievements.sql.go

Lines changed: 32 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/internal/database/sqlc/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/internal/database/sqlc/translations.sql.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/internal/graph/api/achievements.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ func convertRowToSimpleAchievement(row *sqlc.GetAchievementsFilteredCursorRow, h
142142
Name: row.Name,
143143
DescriptionPending: row.DescriptionPending,
144144
DescriptionCompleted: row.DescriptionCompleted,
145+
NotificationText: row.NotificationText,
145146
ImagePending: row.ImagePending,
146147
ImageCompleted: row.ImageCompleted,
147148
Points: int(row.Points),
@@ -172,6 +173,7 @@ func convertRowToContentAchievement(row *sqlc.GetAchievementsFilteredCursorRow,
172173
Name: row.Name,
173174
DescriptionPending: row.DescriptionPending,
174175
DescriptionCompleted: row.DescriptionCompleted,
176+
NotificationText: row.NotificationText,
175177
ImagePending: row.ImagePending,
176178
ImageCompleted: row.ImageCompleted,
177179
Points: int(row.Points),
@@ -194,6 +196,7 @@ func convertRowToStreakAchievement(row *sqlc.GetAchievementsFilteredCursorRow, h
194196
Name: row.Name,
195197
DescriptionPending: row.DescriptionPending,
196198
DescriptionCompleted: row.DescriptionCompleted,
199+
NotificationText: row.NotificationText,
197200
ImagePending: row.ImagePending,
198201
ImageCompleted: row.ImageCompleted,
199202
Points: int(row.Points),
@@ -230,6 +233,7 @@ func convertPublishedContentAchievementRow(row *sqlc.GetPublishedContentAchievem
230233
Name: row.Name,
231234
DescriptionPending: row.DescriptionPending,
232235
DescriptionCompleted: row.DescriptionCompleted,
236+
NotificationText: row.NotificationText,
233237
ImagePending: row.ImagePending,
234238
ImageCompleted: row.ImageCompleted,
235239
Points: int(row.Points),

0 commit comments

Comments
 (0)