Improve testing and mapping code in request and response

martinajir · martinajir · commit 2e52386ba5c8 · 2025-04-22T13:01:04.000Z
diff --git a/README.md b/README.md
@@ -437,6 +437,14 @@ export GITHUB_MCP_TOOL_ADD_ISSUE_COMMENT_DESCRIPTION="an alternative description
   - `state`: Alert state (string, optional)
   - `severity`: Alert severity (string, optional)
 
+### Notifications
+
+- **list_notifications** - List notifications for a GitHub user
+
+  - `page`: Page number (number, optional, default: 1)
+  - `per_page`: Number of records per page (number, optional, default: 30)
+  - `all`: Whether to fetch all notifications, including read ones (boolean, optional, default: false)
+
 ## Resources
 
 ### Repository Content
diff --git a/pkg/github/notifications.go b/pkg/github/notifications.go
@@ -41,10 +41,6 @@ func ListNotifications(getClient GetClientFn, t translations.TranslationHelperFu
 				return mcp.NewToolResultError(err.Error()), nil
 			}
 
-			if request.Params.Arguments["all"] == true {
-				all = true // Set to true if user explicitly asks for all notifications
-			}
-
 			opts := &github.NotificationListOptions{
 				ListOptions: github.ListOptions{
 					Page:    page,
@@ -71,18 +67,7 @@ func ListNotifications(getClient GetClientFn, t translations.TranslationHelperFu
 				return mcp.NewToolResultError(fmt.Sprintf("failed to list notifications: %s", string(body))), nil
 			}
 
-			// Extract the notification title in addition to reason, url, and timestamp.
-			var extractedNotifications []map[string]interface{}
-			for _, notification := range notifications {
-				extractedNotifications = append(extractedNotifications, map[string]interface{}{
-					"title":     notification.GetSubject().GetTitle(),
-					"reason":    notification.GetReason(),
-					"url":       notification.GetURL(),
-					"timestamp": notification.GetUpdatedAt(),
-				})
-			}
-
-			r, err := json.Marshal(extractedNotifications)
+			r, err := json.Marshal(notifications)
 			if err != nil {
 				return nil, fmt.Errorf("failed to marshal notifications: %w", err)
 			}
diff --git a/pkg/github/notifications_test.go b/pkg/github/notifications_test.go
@@ -28,22 +28,22 @@ func Test_ListNotifications(t *testing.T) {
 	// Setup mock notifications
 	mockNotifications := []*github.Notification{
 		{
-			ID:     github.String("1"),
-			Reason: github.String("mention"),
+			ID:     github.Ptr("1"),
+			Reason: github.Ptr("mention"),
 			Subject: &github.NotificationSubject{
-				Title: github.String("Test Notification 1"),
+				Title: github.Ptr("Test Notification 1"),
 			},
 			UpdatedAt: &github.Timestamp{Time: time.Now()},
-			URL:       github.String("https://example.com/notifications/threads/1"),
+			URL:       github.Ptr("https://example.com/notifications/threads/1"),
 		},
 		{
-			ID:     github.String("2"),
-			Reason: github.String("team_mention"),
+			ID:     github.Ptr("2"),
+			Reason: github.Ptr("team_mention"),
 			Subject: &github.NotificationSubject{
-				Title: github.String("Test Notification 2"),
+				Title: github.Ptr("Test Notification 2"),
 			},
 			UpdatedAt: &github.Timestamp{Time: time.Now()},
-			URL:       github.String("https://example.com/notifications/threads/1"),
+			URL:       github.Ptr("https://example.com/notifications/threads/1"),
 		},
 	}
 
@@ -112,15 +112,9 @@ func Test_ListNotifications(t *testing.T) {
 			require.NoError(t, err)
 			assert.Equal(t, len(tc.expectedResponse), len(returnedNotifications))
 			for i, notification := range returnedNotifications {
-				// Ensure all required fields are mocked
-				assert.NotNil(t, notification.Subject, "Subject should not be nil")
-				assert.NotNil(t, notification.Subject.Title, "Title should not be nil")
-				assert.NotNil(t, notification.Reason, "Reason should not be nil")
-				assert.NotNil(t, notification.URL, "URL should not be nil")
-				assert.NotNil(t, notification.UpdatedAt, "UpdatedAt should not be nil")
-				// assert.Equal(t, *tc.expectedResponse[i].ID, *notification.ID)
+				assert.Equal(t, *tc.expectedResponse[i].ID, *notification.ID)
 				assert.Equal(t, *tc.expectedResponse[i].Reason, *notification.Reason)
-				// assert.Equal(t, *tc.expectedResponse[i].Subject.Title, *notification.Subject.Title)
+				assert.Equal(t, *tc.expectedResponse[i].Subject.Title, *notification.Subject.Title)
 			}
 		})
 	}
