Merge pull request #1124 from France-ioi/getGroupInvitations_inviting…

…_user_nullable Make inviting_user in invitationsView nullable
France-ioi · Jul 25, 2024 · 6f518f0 · 6f518f0
2 parents 89a9835 + 6a2cba6
commit 6f518f0
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 15 deletions.
diff --git a/app/api/currentuser/get_group_invitations.feature b/app/api/currentuser/get_group_invitations.feature
@@ -18,6 +18,8 @@ Feature: Get group invitations for the current user
       | 21 | User    | owner self                    |                               | none                                  | null                                   | false                  |
       | 33 | Class   | Other group with invitation   | Other group with invitation   | view                                  | null                                   | false                  |
       | 34 | Class   | Other group with invitation 2 | Other group with invitation 2 | edit                                  | null                                   | false                  |
+      | 35 | Class   | Group with broken change log  | Group with broken change log  | edit                                  | null                                   | false                  |
+      | 36 | Class   | Group without inviting user   | Group without inviting user   | edit                                  | null                                   | false                  |
     And the database has the following table 'users':
       | login       | temp_user | group_id | first_name  | last_name | grade |
       | owner       | 0         | 21       | Jean-Michel | Blanquer  | 3     |
@@ -39,6 +41,8 @@ Feature: Get group invitations for the current user
       | 34       | 21        | invitation_created    | {{relativeTime("-190h")}} | 13           |
       | 34       | 21        | invitation_refused    | {{relativeTime("-180h")}} | 21           |
       | 34       | 21        | invitation_created    | {{relativeTime("-166h")}} | 12           |
+      | 35       | 21        | invitation_accepted   | {{relativeTime("-186h")}} | 12           |
+      | 36       | 21        | invitation_created    | {{relativeTime("-200h")}} | null         |
       | 5        | 21        | invitation_accepted   | {{relativeTime("-165h")}} | 12           |
       | 6        | 21        | join_request_accepted | {{relativeTime("-164h")}} | 12           |
       | 7        | 21        | removed               | {{relativeTime("-163h")}} | 21           |
@@ -48,12 +52,14 @@ Feature: Get group invitations for the current user
       | 10       | 21        | joined_by_code        | {{relativeTime("-180h")}} | null         |
       | 11       | 21        | joined_by_badge       | {{relativeTime("-190h")}} | null         |
     And the database has the following table 'group_pending_requests':
-      | group_id | member_id | type         |
-      | 1        | 21        | invitation   |
-      | 33       | 21        | invitation   |
-      | 34       | 21        | invitation   |
-      | 3        | 21        | join_request |
-      | 1        | 12        | invitation   |
+      | group_id | member_id | type         | at                                             |
+      | 1        | 21        | invitation   | {{currentTimeInFormat("2006-01-02 15:04:05")}} |
+      | 33       | 21        | invitation   | {{currentTimeInFormat("2006-01-02 15:04:05")}} |
+      | 34       | 21        | invitation   | {{currentTimeInFormat("2006-01-02 15:04:05")}} |
+      | 35       | 21        | invitation   | {{relativeTime("-200h")}}                      |
+      | 36       | 21        | invitation   | {{currentTimeInFormat("2006-01-02 15:04:05")}} |
+      | 3        | 21        | join_request | {{currentTimeInFormat("2006-01-02 15:04:05")}} |
+      | 1        | 12        | invitation   | {{currentTimeInFormat("2006-01-02 15:04:05")}} |
 
   Scenario: Show all invitations
     Given I am the user with id "21"
@@ -118,6 +124,34 @@ Feature: Get group invitations for the current user
           "require_watch_approval": true
         },
         "at": "{{timeToRFC(db("group_membership_changes[1][at]"))}}"
+      },
+      {
+        "group_id": "35",
+        "inviting_user": null,
+        "group": {
+          "id": "35",
+          "name": "Group with broken change log",
+          "description": "Group with broken change log",
+          "type": "Class",
+          "require_personal_info_access_approval": "edit",
+          "require_lock_membership_approval_until": null,
+          "require_watch_approval": false
+        },
+        "at": "{{timeToRFC(db("group_pending_requests[4][at]"))}}"
+      },
+      {
+        "group_id": "36",
+        "inviting_user": null,
+        "group": {
+          "id": "36",
+          "name": "Group without inviting user",
+          "description": "Group without inviting user",
+          "type": "Class",
+          "require_personal_info_access_approval": "edit",
+          "require_lock_membership_approval_until": null,
+          "require_watch_approval": false
+        },
+        "at": "{{timeToRFC(db("group_membership_changes[10][at]"))}}"
       }
     ]
     """

diff --git a/app/api/currentuser/get_group_invitations.go b/app/api/currentuser/get_group_invitations.go
@@ -18,9 +18,9 @@ type invitationsViewResponseRow struct {
 	// required: true
 	At database.Time `json:"at"`
 
-	// the user that invited
+	// the user that invited (Nullable)
 	// required: true
-	InvitingUser invitingUser `json:"inviting_user" gorm:"embedded;embedded_prefix:inviting_user__"`
+	InvitingUser *invitingUser `json:"inviting_user" gorm:"embedded;embedded_prefix:inviting_user__"`
 
 	// required: true
 	Group groupWithApprovals `json:"group" gorm:"embedded;embedded_prefix:group__"`
@@ -114,7 +114,7 @@ func (srv *Service) getGroupInvitations(w http.ResponseWriter, r *http.Request)
 	query := store.GroupPendingRequests().
 		Select(`
 			group_pending_requests.group_id,
-			latest_change.at,
+			IFNULL(latest_change.at, group_pending_requests.at) AS at,
 			users.group_id AS inviting_user__id,
 			users.login AS inviting_user__login,
 			users.first_name AS inviting_user__first_name,
@@ -127,15 +127,19 @@ func (srv *Service) getGroupInvitations(w http.ResponseWriter, r *http.Request)
 			groups.require_lock_membership_approval_until AS group__require_lock_membership_approval_until,
 			groups.require_watch_approval AS group__require_watch_approval
 		`).
-		Joins("JOIN LATERAL (?) AS latest_change ON 1",
+		// 'LEFT JOIN' as there can be no corresponding membership change
+		Joins(`
+			LEFT JOIN LATERAL (?) AS latest_change
+				ON latest_change.action = 'invitation_created'`,
 			store.GroupMembershipChanges().
-				Select("initiator_id, at").
+				Select("initiator_id, action, at").
 				Where("group_membership_changes.group_id = group_pending_requests.group_id").
 				Where("group_membership_changes.member_id = group_pending_requests.member_id").
-				Where("group_membership_changes.action = 'invitation_created'").
 				Order("group_membership_changes.at DESC").
-				Limit(1).SubQuery()).
-		Joins("JOIN users ON users.group_id = initiator_id").
+				Limit(1).QueryExpr()).
+		// 'LEFT JOIN' as there can be no corresponding membership change and
+		// 'initiator_id' can be NULL even if there is an invitation_created action
+		Joins("LEFT JOIN users ON users.group_id = initiator_id").
 		Joins("JOIN `groups` ON `groups`.id = group_pending_requests.group_id").
 		Where("group_pending_requests.member_id = ?", user.GroupID).
 		Where("group_pending_requests.type='invitation'")
@@ -145,7 +149,7 @@ func (srv *Service) getGroupInvitations(w http.ResponseWriter, r *http.Request)
 		r, query,
 		&service.SortingAndPagingParameters{
 			Fields: service.SortingAndPagingFields{
-				"at":       {ColumnName: "latest_change.at"},
+				"at":       {ColumnName: "IFNULL(latest_change.at, group_pending_requests.at)"},
 				"group_id": {ColumnName: "group_pending_requests.group_id"},
 			},
 			DefaultRules: "-at,group_id",
@@ -161,6 +165,12 @@ func (srv *Service) getGroupInvitations(w http.ResponseWriter, r *http.Request)
 	var result []invitationsViewResponseRow
 	service.MustNotBeError(query.Scan(&result).Error())
 
+	for index := range result {
+		if result[index].InvitingUser.ID == 0 {
+			result[index].InvitingUser = nil
+		}
+	}
+
 	render.Respond(w, r, result)
 	return service.NoError
 }