Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Enhancements to Query Management and Consistency in SQL Queries #297

Merged
merged 8 commits into from
Dec 23, 2023
Merged

refactor: Enhancements to Query Management and Consistency in SQL Queries #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
864d9b7
Rewrite queries to use raw strings
AlmarAubel Dec 17, 2023
671e878
Refactor additional queries
AlmarAubel Dec 19, 2023
97986e9
refactor more refactor-sql-queries
AlmarAubel Dec 19, 2023
b179408
Also update readme
AlmarAubel Dec 22, 2023
5f52580
Fix formatting
AlmarAubel Dec 22, 2023
f053288
Use correct alias in GetMeetingCommentLikersQueryHandler
AlmarAubel Dec 22, 2023
83c0f8c
formatting
AlmarAubel Dec 22, 2023
9638c92
Refactor sql queries v2 (#6)
AlmarAubel Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,13 +457,15 @@ internal class GetAllMeetingGroupsQueryHandler : IQueryHandler<GetAllMeetingGrou
{
var connection = _sqlConnectionFactory.GetOpenConnection();

const string sql = "SELECT " +
"[MeetingGroup].[Id], " +
"[MeetingGroup].[Name], " +
"[MeetingGroup].[Description], " +
"[MeetingGroup].[LocationCountryCode], " +
"[MeetingGroup].[LocationCity]" +
"FROM [meetings].[v_MeetingGroups] AS [MeetingGroup]";
const string sql = $"""
SELECT
[MeetingGroup].[Id] as [{nameof(MeetingGroupDto.Id)}] ,
[MeetingGroup].[Name] as [{nameof(MeetingGroupDto.Name)}],
[MeetingGroup].[Description] as [{nameof(MeetingGroupDto.Description)}]
[MeetingGroup].[LocationCountryCode] as [{nameof(MeetingGroupDto.LocationCountryCode)}],
[MeetingGroup].[LocationCity] as [{nameof(MeetingGroupDto.LocationCity)}]
FROM [meetings].[v_MeetingGroups] AS [MeetingGroup]
""";
var meetingGroups = await connection.QueryAsync<MeetingGroupDto>(sql);

return meetingGroups.AsList();
Expand Down
32 changes: 17 additions & 15 deletions ...tion/MeetingGroupProposals/GetMeetingGroupProposal/GetMeetingGroupProposalQueryHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,23 @@ public async Task<MeetingGroupProposalDto> Handle(GetMeetingGroupProposalQuery q
{
var connection = _sqlConnectionFactory.GetOpenConnection();

string sql = "SELECT " +
$"[MeetingGroupProposal].[Id] AS [{nameof(MeetingGroupProposalDto.Id)}], " +
$"[MeetingGroupProposal].[Name] AS [{nameof(MeetingGroupProposalDto.Name)}], " +
$"[MeetingGroupProposal].[ProposalUserId] AS [{nameof(MeetingGroupProposalDto.ProposalUserId)}], " +
$"[MeetingGroupProposal].[LocationCity] AS [{nameof(MeetingGroupProposalDto.LocationCity)}], " +
$"[MeetingGroupProposal].[LocationCountryCode] AS [{nameof(MeetingGroupProposalDto.LocationCountryCode)}], " +
$"[MeetingGroupProposal].[Description] AS [{nameof(MeetingGroupProposalDto.Description)}], " +
$"[MeetingGroupProposal].[ProposalDate] AS [{nameof(MeetingGroupProposalDto.ProposalDate)}], " +
$"[MeetingGroupProposal].[StatusCode] AS [{nameof(MeetingGroupProposalDto.StatusCode)}], " +
$"[MeetingGroupProposal].[DecisionDate] AS [{nameof(MeetingGroupProposalDto.DecisionDate)}], " +
$"[MeetingGroupProposal].[DecisionUserId] AS [{nameof(MeetingGroupProposalDto.DecisionUserId)}], " +
$"[MeetingGroupProposal].[DecisionCode] AS [{nameof(MeetingGroupProposalDto.DecisionCode)}], " +
$"[MeetingGroupProposal].[DecisionRejectReason] AS [{nameof(MeetingGroupProposalDto.DecisionRejectReason)}] " +
"FROM [administration].[v_MeetingGroupProposals] AS [MeetingGroupProposal] " +
"WHERE [MeetingGroupProposal].[Id] = @MeetingGroupProposalId";
const string sql = $"""
SELECT
[MeetingGroupProposal].[Id] AS [{nameof(MeetingGroupProposalDto.Id)}],
[MeetingGroupProposal].[Name] AS [{nameof(MeetingGroupProposalDto.Name)}],
[MeetingGroupProposal].[ProposalUserId] AS [{nameof(MeetingGroupProposalDto.ProposalUserId)}],
[MeetingGroupProposal].[LocationCity] AS [{nameof(MeetingGroupProposalDto.LocationCity)}],
[MeetingGroupProposal].[LocationCountryCode] AS [{nameof(MeetingGroupProposalDto.LocationCountryCode)}],
[MeetingGroupProposal].[Description] AS [{nameof(MeetingGroupProposalDto.Description)}],
[MeetingGroupProposal].[ProposalDate] AS [{nameof(MeetingGroupProposalDto.ProposalDate)}],
[MeetingGroupProposal].[StatusCode] AS [{nameof(MeetingGroupProposalDto.StatusCode)}],
[MeetingGroupProposal].[DecisionDate] AS [{nameof(MeetingGroupProposalDto.DecisionDate)}],
[MeetingGroupProposal].[DecisionUserId] AS [{nameof(MeetingGroupProposalDto.DecisionUserId)}],
[MeetingGroupProposal].[DecisionCode] AS [{nameof(MeetingGroupProposalDto.DecisionCode)}],
[MeetingGroupProposal].[DecisionRejectReason] AS [{nameof(MeetingGroupProposalDto.DecisionRejectReason)}]
FROM [administration].[v_MeetingGroupProposals] AS [MeetingGroupProposal]
WHERE [MeetingGroupProposal].[Id] = @MeetingGroupProposalId
""";

return await connection.QuerySingleAsync<MeetingGroupProposalDto>(sql, new { query.MeetingGroupProposalId });
}
Expand Down
30 changes: 16 additions & 14 deletions ...on/MeetingGroupProposals/GetMeetingGroupProposals/GetMeetingGroupProposalsQueryHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,22 @@ public async Task<List<MeetingGroupProposalDto>> Handle(GetMeetingGroupProposals
{
var connection = _sqlConnectionFactory.GetOpenConnection();

string sql = "SELECT " +
$"[MeetingGroupProposal].[Id] AS [{nameof(MeetingGroupProposalDto.Id)}], " +
$"[MeetingGroupProposal].[Name] AS [{nameof(MeetingGroupProposalDto.Name)}], " +
$"[MeetingGroupProposal].[ProposalUserId] AS [{nameof(MeetingGroupProposalDto.ProposalUserId)}], " +
$"[MeetingGroupProposal].[LocationCity] AS [{nameof(MeetingGroupProposalDto.LocationCity)}], " +
$"[MeetingGroupProposal].[LocationCountryCode] AS [{nameof(MeetingGroupProposalDto.LocationCountryCode)}], " +
$"[MeetingGroupProposal].[Description] AS [{nameof(MeetingGroupProposalDto.Description)}], " +
$"[MeetingGroupProposal].[ProposalDate] AS [{nameof(MeetingGroupProposalDto.ProposalDate)}], " +
$"[MeetingGroupProposal].[StatusCode] AS [{nameof(MeetingGroupProposalDto.StatusCode)}], " +
$"[MeetingGroupProposal].[DecisionDate] AS [{nameof(MeetingGroupProposalDto.DecisionDate)}], " +
$"[MeetingGroupProposal].[DecisionUserId] AS [{nameof(MeetingGroupProposalDto.DecisionUserId)}], " +
$"[MeetingGroupProposal].[DecisionCode] AS [{nameof(MeetingGroupProposalDto.DecisionCode)}], " +
$"[MeetingGroupProposal].[DecisionRejectReason] AS [{nameof(MeetingGroupProposalDto.DecisionRejectReason)}] " +
"FROM [administration].[v_MeetingGroupProposals] AS [MeetingGroupProposal] ";
const string sql = $"""
SELECT
[MeetingGroupProposal].[Id] AS [{nameof(MeetingGroupProposalDto.Id)}],
[MeetingGroupProposal].[Name] AS [{nameof(MeetingGroupProposalDto.Name)}],
[MeetingGroupProposal].[ProposalUserId] AS [{nameof(MeetingGroupProposalDto.ProposalUserId)}],
[MeetingGroupProposal].[LocationCity] AS [{nameof(MeetingGroupProposalDto.LocationCity)}],
[MeetingGroupProposal].[LocationCountryCode] AS [{nameof(MeetingGroupProposalDto.LocationCountryCode)}],
[MeetingGroupProposal].[Description] AS [{nameof(MeetingGroupProposalDto.Description)}],
[MeetingGroupProposal].[ProposalDate] AS [{nameof(MeetingGroupProposalDto.ProposalDate)}],
[MeetingGroupProposal].[StatusCode] AS [{nameof(MeetingGroupProposalDto.StatusCode)}],
[MeetingGroupProposal].[DecisionDate] AS [{nameof(MeetingGroupProposalDto.DecisionDate)}],
[MeetingGroupProposal].[DecisionUserId] AS [{nameof(MeetingGroupProposalDto.DecisionUserId)}],
[MeetingGroupProposal].[DecisionCode] AS [{nameof(MeetingGroupProposalDto.DecisionCode)}],
[MeetingGroupProposal].[DecisionRejectReason] AS [{nameof(MeetingGroupProposalDto.DecisionRejectReason)}]
FROM [administration].[v_MeetingGroupProposals] AS [MeetingGroupProposal]
""";

return (await connection.QueryAsync<MeetingGroupProposalDto>(sql)).AsList();
}
Expand Down
21 changes: 11 additions & 10 deletions src/Modules/Administration/Application/Members/GetMember/GetMemberQueryHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,17 @@ public GetMemberQueryHandler(ISqlConnectionFactory sqlConnectionFactory)
public async Task<MemberDto> Handle(GetMemberQuery query, CancellationToken cancellationToken)
{
var connection = _sqlConnectionFactory.GetOpenConnection();

var sql = "SELECT " +
$"[Member].[Id] AS [{nameof(MemberDto.Id)}], " +
$"[Member].[Login] AS [{nameof(MemberDto.Login)}], " +
$"[Member].[Email] AS [{nameof(MemberDto.Email)}], " +
$"[Member].[FirstName] AS [{nameof(MemberDto.FirstName)}], " +
$"[Member].[LastName] AS [{nameof(MemberDto.LastName)}], " +
$"[Member].[Name] AS [{nameof(MemberDto.Name)}] " +
"FROM [administration].[v_Members] AS [Member] " +
"WHERE [Member].[Id] = @MemberId";
const string sql = $"""
SELECT
[Member].[Id] AS [{nameof(MemberDto.Id)}],
[Member].[Login] AS [{nameof(MemberDto.Login)}],
[Member].[Email] AS [{nameof(MemberDto.Email)}],
[Member].[FirstName] AS [{nameof(MemberDto.FirstName)}],
[Member].[LastName] AS [{nameof(MemberDto.LastName)}],
[Member].[Name] AS [{nameof(MemberDto.Name)}]
FROM [administration].[v_Members] AS [Member]
WHERE [Member].[Id] = @MemberId
""";

return await connection.QuerySingleAsync<MemberDto>(sql, new { query.MemberId });
}
Expand Down
24 changes: 14 additions & 10 deletions ...dministration/Infrastructure/Configuration/Processing/Inbox/ProcessInboxCommandHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,23 @@ public ProcessInboxCommandHandler(IMediator mediator, ISqlConnectionFactory sqlC
public async Task Handle(ProcessInboxCommand command, CancellationToken cancellationToken)
{
var connection = this._sqlConnectionFactory.GetOpenConnection();
string sql = "SELECT " +
$"[InboxMessage].[Id] AS [{nameof(InboxMessageDto.Id)}], " +
$"[InboxMessage].[Type] AS [{nameof(InboxMessageDto.Type)}], " +
$"[InboxMessage].[Data] AS [{nameof(InboxMessageDto.Data)}] " +
"FROM [administration].[InboxMessages] AS [InboxMessage] " +
"WHERE [InboxMessage].[ProcessedDate] IS NULL " +
"ORDER BY [InboxMessage].[OccurredOn]";
const string sql = $"""
SELECT
[InboxMessage].[Id] AS [{nameof(InboxMessageDto.Id)}],
[InboxMessage].[Type] AS [{nameof(InboxMessageDto.Type)}],
[InboxMessage].[Data] AS [{nameof(InboxMessageDto.Data)}]
FROM [administration].[InboxMessages] AS [InboxMessage]
WHERE [InboxMessage].[ProcessedDate] IS NULL
ORDER BY [InboxMessage].[OccurredOn]
""";

var messages = await connection.QueryAsync<InboxMessageDto>(sql);

const string sqlUpdateProcessedDate = "UPDATE [administration].[InboxMessages] " +
"SET [ProcessedDate] = @Date " +
"WHERE [Id] = @Id";
const string sqlUpdateProcessedDate = """
UPDATE [administration].[InboxMessages]
SET [ProcessedDate] = @Date
WHERE [Id] = @Id
""";

foreach (var message in messages)
{
Expand Down
16 changes: 9 additions & 7 deletions ...ucture/Configuration/Processing/InternalCommands/ProcessInternalCommandsCommandHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ public async Task Handle(ProcessInternalCommandsCommand command, CancellationTok
{
var connection = this._sqlConnectionFactory.GetOpenConnection();

string sql = "SELECT " +
$"[Command].[Id] AS [{nameof(InternalCommandDto.Id)}], " +
$"[Command].[Type] AS [{nameof(InternalCommandDto.Type)}], " +
$"[Command].[Data] AS [{nameof(InternalCommandDto.Data)}] " +
"FROM [administration].[InternalCommands] AS [Command] " +
"WHERE [Command].[ProcessedDate] IS NULL " +
"ORDER BY [Command].[EnqueueDate]";
const string sql = $"""
SELECT
[Command].[Id] AS [{nameof(InternalCommandDto.Id)}],
[Command].[Type] AS [{nameof(InternalCommandDto.Type)}],
[Command].[Data] AS [{nameof(InternalCommandDto.Data)}]
FROM [administration].[InternalCommands] AS [Command]
WHERE [Command].[ProcessedDate] IS NULL
ORDER BY [Command].[EnqueueDate]
""";

var commands = await connection.QueryAsync<InternalCommandDto>(sql);

Expand Down
16 changes: 9 additions & 7 deletions ...inistration/Infrastructure/Configuration/Processing/Outbox/ProcessOutboxCommandHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ public ProcessOutboxCommandHandler(
public async Task Handle(ProcessOutboxCommand command, CancellationToken cancellationToken)
{
var connection = this._sqlConnectionFactory.GetOpenConnection();
string sql = "SELECT " +
$"[OutboxMessage].[Id] AS [{nameof(OutboxMessageDto.Id)}], " +
$"[OutboxMessage].[Type] AS [{nameof(OutboxMessageDto.Type)}], " +
$"[OutboxMessage].[Data] AS [{nameof(OutboxMessageDto.Data)}] " +
"FROM [administration].[OutboxMessages] AS [OutboxMessage] " +
"WHERE [OutboxMessage].[ProcessedDate] IS NULL " +
"ORDER BY [OutboxMessage].[OccurredOn]";
const string sql = $"""
SELECT
[OutboxMessage].[Id] AS [{nameof(OutboxMessageDto.Id)}],
[OutboxMessage].[Type] AS [{nameof(OutboxMessageDto.Type)}],
[OutboxMessage].[Data] AS [{nameof(OutboxMessageDto.Data)}]
FROM [administration].[OutboxMessages] AS [OutboxMessage]
WHERE [OutboxMessage].[ProcessedDate] IS NULL
ORDER BY [OutboxMessage].[OccurredOn]
""";

var messages = await connection.QueryAsync<OutboxMessageDto>(sql);
var messagesList = messages.AsList();
Expand Down
14 changes: 8 additions & 6 deletions src/Modules/Administration/Tests/IntegrationTests/SeedWork/OutboxMessagesHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ public class OutboxMessagesHelper
{
public static async Task<List<OutboxMessageDto>> GetOutboxMessages(IDbConnection connection)
{
const string sql = "SELECT " +
"[OutboxMessage].[Id], " +
"[OutboxMessage].[Type], " +
"[OutboxMessage].[Data] " +
"FROM [administration].[OutboxMessages] AS [OutboxMessage] " +
"ORDER BY [OutboxMessage].[OccurredOn]";
const string sql = """
SELECT
[OutboxMessage].[Id],
[OutboxMessage].[Type],
[OutboxMessage].[Data]
FROM [administration].[OutboxMessages] AS [OutboxMessage]
ORDER BY [OutboxMessage].[OccurredOn]
""";

var messages = await connection.QueryAsync<OutboxMessageDto>(sql);
return messages.AsList();
Expand Down
13 changes: 8 additions & 5 deletions src/Modules/Meetings/Application/Countries/GetAllCountriesQueryHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ public async Task<List<CountryDto>> Handle(GetAllCountriesQuery query, Cancellat
{
var connection = _sqlConnectionFactory.GetOpenConnection();

return (await connection.QueryAsync<CountryDto>(
"SELECT " +
$"[Country].[Code] AS [{nameof(CountryDto.Code)}], " +
$"[Country].[Name] AS [{nameof(CountryDto.Name)}] " +
"FROM [meetings].[v_Countries] AS [Country]")).AsList();
const string sql = $"""
SELECT
[Country].[Code] AS [{nameof(CountryDto.Code)}],
[Country].[Name] AS [{nameof(CountryDto.Name)}]
FROM [meetings].[v_Countries] AS [Country]
""";

return (await connection.QueryAsync<CountryDto>(sql)).AsList();
}
}
}
12 changes: 7 additions & 5 deletions ...ations/GetMeetingCommentingConfiguration/GetMeetingCommentingConfigurationQueryHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ public async Task<MeetingCommentingConfigurationDto> Handle(GetMeetingCommenting
{
var connection = _sqlConnectionFactory.GetOpenConnection();

string sql = "SELECT " +
$"[MeetingCommentingConfiguration].[MeetingId] AS [{nameof(MeetingCommentingConfigurationDto.MeetingId)}], " +
$"[MeetingCommentingConfiguration].[IsCommentingEnabled] AS [{nameof(MeetingCommentingConfigurationDto.IsCommentingEnabled)}] " +
"FROM [meetings].[MeetingCommentingConfigurations] AS [MeetingCommentingConfiguration] " +
"WHERE [MeetingCommentingConfiguration].[MeetingId] = @MeetingId";
const string sql = $"""
SELECT
[MeetingCommentingConfiguration].[MeetingId] AS [{nameof(MeetingCommentingConfigurationDto.MeetingId)}],
[MeetingCommentingConfiguration].[IsCommentingEnabled] AS [{nameof(MeetingCommentingConfigurationDto.IsCommentingEnabled)}]
FROM [meetings].[MeetingCommentingConfigurations] AS [MeetingCommentingConfiguration]
WHERE [MeetingCommentingConfiguration].[MeetingId] = @MeetingId
""";

return await connection.QuerySingleOrDefaultAsync<MeetingCommentingConfigurationDto>(sql, new { query.MeetingId });
}
Expand Down
Loading
Loading