From 40467dd62906987e35c6c308a5d4ec65ef77720a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=BD=D0=BE=D0=B9=20=D0=B8=D1=88?=
 =?UTF-8?q?=D0=B0=D0=BA?= <69521267+undrcrxwn@users.noreply.github.com>
Date: Tue, 30 Jan 2024 17:09:16 +0300
Subject: [PATCH] fix(discussions): merge conflicting discussion controller
 methods

---
 .../v1/Controllers/DiscussionsController.cs          | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/CrowdParlay.Social.Api/v1/Controllers/DiscussionsController.cs b/src/CrowdParlay.Social.Api/v1/Controllers/DiscussionsController.cs
index 41c5fb0..fcadbff 100644
--- a/src/CrowdParlay.Social.Api/v1/Controllers/DiscussionsController.cs
+++ b/src/CrowdParlay.Social.Api/v1/Controllers/DiscussionsController.cs
@@ -22,19 +22,13 @@ public class DiscussionsController : ControllerBase
     public async Task<DiscussionDto> GetDiscussionById([FromRoute] Guid discussionId) =>
         await _discussions.GetByIdAsync(discussionId);
 
-    /// <summary>
-    /// Returns all discussions.
-    /// </summary>
-    [HttpGet]
-    public async Task<IEnumerable<DiscussionDto>> GetAllDiscussions() =>
-        await _discussions.GetAllAsync();
-
     /// <summary>
     /// Returns all discussions created by author with the specified ID.
     /// </summary>
     [HttpGet]
-    public async Task<IEnumerable<DiscussionDto>> GetDiscussionsByAuthor([FromQuery] Guid authorId) =>
-        await _discussions.GetByAuthorAsync(authorId);
+    public async Task<IEnumerable<DiscussionDto>> GetDiscussions([FromQuery] Guid? authorId) => authorId is null
+        ? await _discussions.GetAllAsync()
+        : await _discussions.GetByAuthorAsync(authorId.Value);
 
     /// <summary>
     /// Creates a discussion.