Jo leser ikke dokumentasjon

dotkom · Mar 11, 2024 · b8fedef · b8fedef
1 parent 43a4dad
commit b8fedef
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/backend/app/db/group_members.py b/backend/app/db/group_members.py
@@ -138,7 +138,7 @@ async def get_raw_punishments(
         conn: Optional[Pool] = None,
     ) -> list[dict[str, Any]]:
         async with MaybeAcquire(conn, self.db.pool) as conn:
-            query = """SELECT gp.*, CONCAT(COALESCE(NULLIF('', users.first_name), users.email), ' ', users.last_name) AS created_by_name, COALESCE(json_agg(pr) FILTER (WHERE pr.punishment_reaction_id IS NOT NULL), '[]') as reactions
+            query = """SELECT gp.*, CONCAT(COALESCE(NULLIF(users.first_name, ''), users.email), ' ', users.last_name) AS created_by_name, COALESCE(json_agg(pr) FILTER (WHERE pr.punishment_reaction_id IS NOT NULL), '[]') as reactions
                     FROM group_punishments gp
                     LEFT JOIN (
                         SELECT pr1.*
@@ -165,7 +165,7 @@ async def get_raw_punishments_for_multiple(
         conn: Optional[Pool] = None,
     ) -> dict[UserId, list[dict[UserId, Any]]]:
         async with MaybeAcquire(conn, self.db.pool) as conn:
-            query = """SELECT gp.*, CONCAT(COALESCE(NULLIF('', users.first_name), users.email), ' ', users.last_name) AS created_by_name, COALESCE(json_agg(pr) FILTER (WHERE pr.punishment_reaction_id IS NOT NULL), '[]') as reactions
+            query = """SELECT gp.*, CONCAT(COALESCE(NULLIF(users.first_name, ''), users.email), ' ', users.last_name) AS created_by_name, COALESCE(json_agg(pr) FILTER (WHERE pr.punishment_reaction_id IS NOT NULL), '[]') as reactions
                     FROM group_punishments gp
                     LEFT JOIN (
                         SELECT pr1.*

diff --git a/backend/app/db/group_users.py b/backend/app/db/group_users.py
@@ -68,14 +68,14 @@ async def get_all(
                 WITH punishments_with_reactions AS (
                     SELECT
                         gp.*,
-                        COALESCE(NULLIF('', u.first_name), email) || ' ' || u.last_name as created_by_name,
+                        COALESCE(NULLIF(u.first_name, ''), email) || ' ' || u.last_name as created_by_name,
                         COALESCE(json_agg(json_build_object(
                             'punishment_reaction_id', pr.punishment_reaction_id,
                             'punishment_id', pr.punishment_id,
                             'emoji', pr.emoji,
                             'created_at', pr.created_at,
                             'created_by', pr.created_by,
-                            'created_by_name', (SELECT COALESCE(NULLIF('', first_name), email) || ' ' || last_name FROM users WHERE user_id = pr.created_by)
+                            'created_by_name', (SELECT COALESCE(NULLIF(first_name, ''), email) || ' ' || last_name FROM users WHERE user_id = pr.created_by)
                         )) FILTER (WHERE pr.punishment_reaction_id IS NOT NULL), '[]') as reactions
                     FROM group_punishments gp
                     LEFT JOIN group_members gm

diff --git a/backend/app/db/punishments.py b/backend/app/db/punishments.py
@@ -51,7 +51,7 @@ async def get(
         conn: Optional[Pool] = None,
     ) -> PunishmentRead:
         async with MaybeAcquire(conn, self.db.pool) as conn:
-            query = """SELECT gp.*, CONCAT(COALESCE(NULLIF('', users.first_name, users.email)), ' ', users.last_name) AS created_by_name, COALESCE(json_agg(pr) FILTER (WHERE pr.punishment_reaction_id IS NOT NULL), '[]') as reactions FROM group_punishments gp
+            query = """SELECT gp.*, CONCAT(COALESCE(NULLIF(users.first_name, ''), users.email)), ' ', users.last_name) AS created_by_name, COALESCE(json_agg(pr) FILTER (WHERE pr.punishment_reaction_id IS NOT NULL), '[]') as reactions FROM group_punishments gp
                        LEFT JOIN punishment_reactions pr ON pr.punishment_id = gp.punishment_id
                        LEFT JOIN users ON gp.created_by = users.user_id
                        WHERE gp.punishment_id = $1

diff --git a/backend/app/db/users.py b/backend/app/db/users.py
@@ -56,14 +56,14 @@ async def get_leaderboard(
                     WITH punishments_with_reactions AS (
                         SELECT
                             gp.*,
-                            COALESCE(NULLIF('', u.first_name), u.email) || ' ' || u.last_name as created_by_name,
+                            COALESCE(NULLIF(u.first_name, ''), u.email) || ' ' || u.last_name as created_by_name,
                             COALESCE(json_agg(json_build_object(
                                 'punishment_reaction_id', pr.punishment_reaction_id,
                                 'punishment_id', pr.punishment_id,
                                 'emoji', pr.emoji,
                                 'created_at', pr.created_at,
                                 'created_by', pr.created_by,
-                                'created_by_name', (SELECT COALESCE(NULLIF('', first_name), email) || ' ' || last_name FROM users WHERE user_id = pr.created_by)
+                                'created_by_name', (SELECT COALESCE(NULLIF(first_name, ''), email) || ' ' || last_name FROM users WHERE user_id = pr.created_by)
                             )) FILTER (WHERE pr.punishment_reaction_id IS NOT NULL), '[]') as reactions
                         FROM group_punishments gp
                         LEFT JOIN punishment_reactions pr