Refactoring Inc.TeamAssistant.Appraiser.DataAccess

dyatlov-a · Dec 12, 2024 · 2638931 · 2638931
1 parent 50e4e3a
commit 2638931
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/src/Inc.TeamAssistant.Appraiser.DataAccess/EstimatesStatsProvider.cs b/src/Inc.TeamAssistant.Appraiser.DataAccess/EstimatesStatsProvider.cs
@@ -26,7 +26,7 @@ public async Task<IReadOnlyDictionary<long, int>> GetStats(
             """
             SELECT
                 sfe.participant_id AS personid,
-                count(*) AS eventscount
+                COUNT(*) AS eventscount
             FROM appraiser.story_for_estimates AS sfe
             JOIN appraiser.stories AS s ON sfe.story_id = s.id
             WHERE s.created > @from AND sfe.participant_id = ANY(@person_ids) AND sfe.value > 0

diff --git a/...iser.DataAccess/Internal/GetStoryQuery.cs → ...ant.Appraiser.DataAccess/StoryProvider.cs b/...iser.DataAccess/Internal/GetStoryQuery.cs → ...ant.Appraiser.DataAccess/StoryProvider.cs
@@ -2,9 +2,9 @@
 using Inc.TeamAssistant.Appraiser.Domain;
 using Npgsql;
 
-namespace Inc.TeamAssistant.Appraiser.DataAccess.Internal;
+namespace Inc.TeamAssistant.Appraiser.DataAccess;
 
-internal static class GetStoryQuery
+internal static class StoryProvider
 {
     public static async Task<IReadOnlyCollection<Story>> Get(
         NpgsqlConnection connection,

diff --git a/src/Inc.TeamAssistant.Appraiser.DataAccess/StoryReader.cs b/src/Inc.TeamAssistant.Appraiser.DataAccess/StoryReader.cs
@@ -1,6 +1,5 @@
 using Dapper;
 using Inc.TeamAssistant.Appraiser.Application.Contracts;
-using Inc.TeamAssistant.Appraiser.DataAccess.Internal;
 using Inc.TeamAssistant.Appraiser.Domain;
 using Inc.TeamAssistant.Primitives.DataAccess;
 
@@ -37,7 +36,7 @@ public async Task<IReadOnlyCollection<Story>> GetStories(
                 s.rounds_count AS roundscount,
                 s.url AS url
             FROM appraiser.stories AS s
-            WHERE s.team_id = @team_id AND s.created <= @before AND (@from is null OR s.created >= @from);",
+            WHERE s.team_id = @team_id AND s.created <= @before AND (@from IS NULL OR s.created >= @from);",
             new
             {
                 team_id = teamId,
@@ -74,7 +73,7 @@ FROM appraiser.stories AS s
         await using var connection = _connectionFactory.Create();
 
         var storyIds = await connection.QueryAsync<Guid>(command);
-        var stories = await GetStoryQuery.Get(connection, storyIds.ToArray(), token);
+        var stories = await StoryProvider.Get(connection, storyIds.ToArray(), token);
         var results = stories.OrderBy(p => p.Created).ToArray();
 
         return results;
@@ -86,7 +85,7 @@ FROM appraiser.stories AS s
             SELECT
                 s.id AS id
             FROM appraiser.stories AS s
-            WHERE s.team_id = @team_id AND total_value is null
+            WHERE s.team_id = @team_id AND total_value IS NULL
             ORDER BY s.created
             OFFSET 0
             LIMIT 1;",
@@ -100,7 +99,7 @@ OFFSET 0
         if (!storyId.HasValue)
             return null;
 
-        var stories = await GetStoryQuery.Get(connection, new[] { storyId.Value }, token);
+        var stories = await StoryProvider.Get(connection, new[] { storyId.Value }, token);
         return stories.SingleOrDefault();
     }
 }
diff --git a/src/Inc.TeamAssistant.Appraiser.DataAccess/StoryRepository.cs b/src/Inc.TeamAssistant.Appraiser.DataAccess/StoryRepository.cs
@@ -1,7 +1,5 @@
-using System.Text.Json;
 using Dapper;
 using Inc.TeamAssistant.Appraiser.Application.Contracts;
-using Inc.TeamAssistant.Appraiser.DataAccess.Internal;
 using Inc.TeamAssistant.Appraiser.Domain;
 using Inc.TeamAssistant.Primitives.DataAccess;
 
@@ -20,7 +18,7 @@ public StoryRepository(IConnectionFactory connectionFactory)
     {
         await using var connection = _connectionFactory.Create();
 
-        var stories = await GetStoryQuery.Get(connection, new[] { storyId }, token);
+        var stories = await StoryProvider.Get(connection, new[] { storyId }, token);
 
         return stories.SingleOrDefault();
     }