Skip to content

TD-5329 fix bug with adding competencies to a new group #3109

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

Merged
merged 1 commit into from
Feb 3, 2025
Merged

TD-5329 fix bug with adding competencies to a new group #3109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 6 additions & 35 deletions DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,31 +574,13 @@ FROM FrameworkCompetencyGroups
return existingId;
}

var numberOfAffectedRows = connection.Execute(
existingId = connection.QuerySingle<int>(
@"INSERT INTO CompetencyGroups ([Name], [Description], UpdatedByAdminID)
OUTPUT INSERTED.Id
VALUES (@groupName, @groupDescription, @adminId)",
new { groupName, groupDescription, adminId }
);
if (numberOfAffectedRows < 1)
{
logger.LogWarning(
"Not inserting competency group as db insert failed. " +
$"Group name: {groupName}, admin id: {adminId}"
);
return -1;
}

existingId = connection.QuerySingle<int>(
@"SELECT COALESCE
((SELECT TOP (1) ID
FROM CompetencyGroups
WHERE (Name = @groupName) AND EXISTS
(SELECT 1 AS Expr1
FROM FrameworkCompetencyGroups
WHERE (CompetencyGroupID = CompetencyGroups.ID) AND (FrameworkID = @frameworkId) OR
(CompetencyGroupID = CompetencyGroups.ID) AND (@frameworkId IS NULL))), 0) AS CompetencyGroupID",
new { groupName, groupDescription }
);

return existingId;
}

Expand All @@ -621,27 +603,16 @@ public int InsertFrameworkCompetencyGroup(int groupId, int frameworkId, int admi
return existingId;
}

var numberOfAffectedRows = connection.Execute(
existingId = connection.QuerySingle<int>(
@"INSERT INTO FrameworkCompetencyGroups (CompetencyGroupID, UpdatedByAdminID, Ordering, FrameworkID)
OUTPUT INSERTED.Id
VALUES (@groupId, @adminId, COALESCE
((SELECT MAX(Ordering)
FROM [FrameworkCompetencyGroups]
WHERE ([FrameworkID] = @frameworkId)), 0)+1, @frameworkId)",
new { groupId, adminId, frameworkId }
);
if (numberOfAffectedRows < 1)
{
logger.LogWarning(
"Not inserting framework competency group as db insert failed. " +
$"Group id: {groupId}, admin id: {adminId}, frameworkId: {frameworkId}"
);
return -1;
}

existingId = connection.QuerySingle<int>(
@"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencyGroups WHERE CompetencyGroupID = @groupID AND FrameworkID = @frameworkID), 0) AS FrameworkCompetencyGroupID",
new { groupId, frameworkId }
);

return existingId;
}

Expand Down
Loading