fix uses of LEFT JOIN when JOIN was needed

devsoc-unsw · Dec 2, 2024 · 80c1abe · 80c1abe
1 parent 43e47cd
commit 80c1abe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/backend/server/src/models/application.rs b/backend/server/src/models/application.rs
@@ -144,7 +144,7 @@ impl Application {
                 u.zid AS user_zid, u.name AS user_name, u.gender AS user_gender,
                 u.pronouns AS user_pronouns, u.degree_name AS user_degree_name,
                 u.degree_starting_year AS user_degree_starting_year
-                FROM applications a LEFT JOIN users u ON u.id = a.user_id
+                FROM applications a JOIN users u ON u.id = a.user_id
                 WHERE a.id = $1 AND a.submitted = true
             ",
             id
@@ -158,7 +158,7 @@ impl Application {
                 SELECT application_roles.campaign_role_id,
                 application_roles.preference, campaign_roles.name AS role_name
                 FROM application_roles
-                    LEFT JOIN campaign_roles
+                    JOIN campaign_roles
                     ON application_roles.campaign_role_id = campaign_roles.id
                 WHERE application_id = $1
             ",
@@ -201,7 +201,7 @@ impl Application {
                 u.zid AS user_zid, u.name AS user_name, u.gender AS user_gender,
                 u.pronouns AS user_pronouns, u.degree_name AS user_degree_name,
                 u.degree_starting_year AS user_degree_starting_year
-                FROM applications a LEFT JOIN users u ON u.id = a.user_id LEFT JOIN application_roles ar on ar.application_id = a.id
+                FROM applications a JOIN users u ON u.id = a.user_id JOIN application_roles ar on ar.application_id = a.id
                 WHERE ar.id = $1 AND a.submitted = true
             ",
             role_id
@@ -217,7 +217,7 @@ impl Application {
                     SELECT application_roles.campaign_role_id,
                     application_roles.preference, campaign_roles.name AS role_name
                     FROM application_roles
-                        LEFT JOIN campaign_roles
+                        JOIN campaign_roles
                         ON application_roles.campaign_role_id = campaign_roles.id
                     WHERE application_id = $1
                 ",
@@ -265,7 +265,7 @@ impl Application {
                 u.zid AS user_zid, u.name AS user_name, u.gender AS user_gender,
                 u.pronouns AS user_pronouns, u.degree_name AS user_degree_name,
                 u.degree_starting_year AS user_degree_starting_year
-                FROM applications a LEFT JOIN users u ON u.id = a.user_id
+                FROM applications a JOIN users u ON u.id = a.user_id
                 WHERE a.campaign_id = $1 AND a.submitted = true
             ",
             campaign_id
@@ -281,7 +281,7 @@ impl Application {
                     SELECT application_roles.campaign_role_id,
                     application_roles.preference, campaign_roles.name AS role_name
                     FROM application_roles
-                        LEFT JOIN campaign_roles
+                        JOIN campaign_roles
                         ON application_roles.campaign_role_id = campaign_roles.id
                     WHERE application_id = $1
                 ",
@@ -329,7 +329,7 @@ impl Application {
                 u.zid AS user_zid, u.name AS user_name, u.gender AS user_gender,
                 u.pronouns AS user_pronouns, u.degree_name AS user_degree_name,
                 u.degree_starting_year AS user_degree_starting_year
-                FROM applications a LEFT JOIN users u ON u.id = a.user_id
+                FROM applications a JOIN users u ON u.id = a.user_id
                 WHERE a.user_id = $1
             ",
             user_id
@@ -345,7 +345,7 @@ impl Application {
                     SELECT application_roles.campaign_role_id,
                     application_roles.preference, campaign_roles.name AS role_name
                     FROM application_roles
-                        LEFT JOIN campaign_roles
+                        JOIN campaign_roles
                         ON application_roles.campaign_role_id = campaign_roles.id
                     WHERE application_id = $1
                 ",

diff --git a/backend/server/src/models/organisation.rs b/backend/server/src/models/organisation.rs
@@ -194,7 +194,7 @@ impl Organisation {
         Member,
         "
             SELECT organisation_members.user_id as id, organisation_members.role AS \"role: OrganisationRole\", users.name from organisation_members
-                LEFT JOIN users on users.id = organisation_members.user_id
+                JOIN users on users.id = organisation_members.user_id
                 WHERE organisation_members.organisation_id = $1 AND organisation_members.role = $2
         ",
         organisation_id,
@@ -216,7 +216,7 @@ impl Organisation {
         Member,
         "
             SELECT organisation_members.user_id as id, organisation_members.role AS \"role: OrganisationRole\", users.name from organisation_members
-                LEFT JOIN users on users.id = organisation_members.user_id
+                JOIN users on users.id = organisation_members.user_id
                 WHERE organisation_members.organisation_id = $1
         ",
         organisation_id