From 9aaa1bc423228f20e26f8a428ed53bdc95e94283 Mon Sep 17 00:00:00 2001 From: Vladimir Pecanac Date: Sat, 14 Nov 2026 14:18:16 +0100 Subject: [PATCH 1/2] LINQInnerJoin: move to net11.0, fix course categories, add composite key, tuple Join and GroupJoin examples Both projects target net11.0. FluentAssertions is replaced with plain xUnit asserts (InternalsVisibleTo for the anonymous result types), and the test packages move to xunit 2.9.3, xunit.runner.visualstudio 4.0.1, Microsoft.NET.Test.Sdk 18.12.0 and coverlet.collector 10.1.0. The databases now sit in category 3 and the DevOps tools in category 2, matching the category names. The grouping helpers use IGrouping so reading the key no longer throws on .NET 9 and later. New Grade entity and examples for a composite key join, the .NET 11 Join overload without a result selector, and GroupJoin, with four new tests. --- .../LINQInnerJoin/LinqInnerJoin/Category.cs | 43 +- .../LINQInnerJoin/LinqInnerJoin/Course.cs | 89 +--- .../LINQInnerJoin/LinqInnerJoin/Enrolment.cs | 67 ++- .../LinqInnerJoin/EnrolmentHelper.cs | 408 +++++++++++------- .../LINQInnerJoin/LinqInnerJoin/Grade.cs | 16 + .../LinqInnerJoin/LinqInnerJoin.csproj | 6 +- .../LINQInnerJoin/LinqInnerJoin/Program.cs | 88 ++-- .../LINQInnerJoin/LinqInnerJoin/Student.cs | 55 +-- .../Tests/LinqInnerJoinUnitTest.cs | 311 +++++++------ csharp-linq/LINQInnerJoin/Tests/Tests.csproj | 11 +- 10 files changed, 577 insertions(+), 517 deletions(-) create mode 100644 csharp-linq/LINQInnerJoin/LinqInnerJoin/Grade.cs diff --git a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Category.cs b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Category.cs index e94b13111d..271cb65baf 100644 --- a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Category.cs +++ b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Category.cs @@ -1,33 +1,14 @@ -namespace LinqInnerJoin -{ - public class Category - { - public int Id { get; set; } - public string Name { get; set; } - - public static IEnumerable GetDummyCourseCategories() - { - List categories = new() - { - "Programming Language", - "DevOps", - "Database System" - }; - - List courseCategories = new List(); - int id = 1; - - foreach (var category in categories) - { - courseCategories.Add(new Category - { - Id = id++, - Name = category - }); - } - - return courseCategories; - } - } +namespace LinqInnerJoin; +public class Category +{ + public int Id { get; set; } + public string Name { get; set; } = string.Empty; + + public static IEnumerable GetDummyCourseCategories() => + [ + new() { Id = 1, Name = "Programming Language" }, + new() { Id = 2, Name = "DevOps" }, + new() { Id = 3, Name = "Database System" } + ]; } diff --git a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Course.cs b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Course.cs index 7a23c54fb3..74434b45c8 100644 --- a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Course.cs +++ b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Course.cs @@ -1,68 +1,25 @@ -namespace LinqInnerJoin -{ - public class Course - { - public int Id { get; set; } - public string Name { get; set; } - public int CategoryId { get; set; } - - public static IEnumerable GetDummyCourses() - { - int id = 1; - List courses = new(); - - List programmingLanguages = new() - { - "CSHARP", - "PYTHON", - "JAVA", - "RUBY", - "GO" - }; - - List databases = new() - { - "MSSQL", - "POSTGRES", - "MONGODB", - "MYSQL" - }; - - List devops = new() - { - "DOCKER", - "JENKINS", - "GIT", - "KUBERNETES" - }; - - courses.AddRange(from pr in programmingLanguages - select new Course - { - Id = id++, - CategoryId = 1, - Name = pr - }); +namespace LinqInnerJoin; - - courses.AddRange(from db in databases - select new Course - { - Id = id++, - CategoryId = 2, - Name = db - }); - - - courses.AddRange(from dv in devops - select new Course - { - Id = id++, - CategoryId = 3, - Name = dv - }); - - return courses; - } - } +public class Course +{ + public int Id { get; set; } + public string Name { get; set; } = string.Empty; + public int CategoryId { get; set; } + + public static IEnumerable GetDummyCourses() => + [ + new() { Id = 1, Name = "CSHARP", CategoryId = 1 }, + new() { Id = 2, Name = "PYTHON", CategoryId = 1 }, + new() { Id = 3, Name = "JAVA", CategoryId = 1 }, + new() { Id = 4, Name = "RUBY", CategoryId = 1 }, + new() { Id = 5, Name = "GO", CategoryId = 1 }, + new() { Id = 6, Name = "MSSQL", CategoryId = 3 }, + new() { Id = 7, Name = "POSTGRES", CategoryId = 3 }, + new() { Id = 8, Name = "MONGODB", CategoryId = 3 }, + new() { Id = 9, Name = "MYSQL", CategoryId = 3 }, + new() { Id = 10, Name = "DOCKER", CategoryId = 2 }, + new() { Id = 11, Name = "JENKINS", CategoryId = 2 }, + new() { Id = 12, Name = "GIT", CategoryId = 2 }, + new() { Id = 13, Name = "KUBERNETES", CategoryId = 2 } + ]; } diff --git a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Enrolment.cs b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Enrolment.cs index db983765e5..7193632e31 100644 --- a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Enrolment.cs +++ b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Enrolment.cs @@ -1,39 +1,32 @@ -namespace LinqInnerJoin +namespace LinqInnerJoin; + +public class Enrolment { - public class Enrolment - { - public int Id { get; set; } - public int StudentId { get; set; } - public int CourseId { get; set; } - - public static IEnumerable GetDummyEnrolment() - { - int id = 1; - IEnumerable enrolments = new List() - { - new Enrolment { Id = id++, CourseId = 1, StudentId = 1}, - new Enrolment { Id = id++, CourseId = 8, StudentId = 1}, - new Enrolment { Id = id++, CourseId = 12, StudentId = 1}, - new Enrolment { Id = id++, CourseId = 2, StudentId = 2}, - new Enrolment { Id = id++, CourseId = 3, StudentId = 2}, - new Enrolment { Id = id++, CourseId = 7, StudentId = 3}, - new Enrolment { Id = id++, CourseId = 1, StudentId = 3}, - new Enrolment { Id = id++, CourseId = 9, StudentId = 4}, - new Enrolment { Id = id++, CourseId = 9, StudentId = 5}, - new Enrolment { Id = id++, CourseId = 6, StudentId = 6}, - new Enrolment { Id = id++, CourseId = 5, StudentId = 6}, - new Enrolment { Id = id++, CourseId = 11, StudentId = 6}, - new Enrolment { Id = id++, CourseId = 9, StudentId = 7}, - new Enrolment { Id = id++, CourseId = 12, StudentId = 8}, - new Enrolment { Id = id++, CourseId = 7, StudentId = 8}, - new Enrolment { Id = id++, CourseId = 1, StudentId = 9}, - new Enrolment { Id = id++, CourseId = 10, StudentId = 9}, - new Enrolment { Id = id++, CourseId = 4, StudentId = 10}, - new Enrolment { Id = id++, CourseId = 10, StudentId = 10}, - new Enrolment { Id = id++, CourseId = 8, StudentId = 10}, - }; - - return enrolments; - } - } + public int Id { get; set; } + public int StudentId { get; set; } + public int CourseId { get; set; } + + public static IEnumerable GetDummyEnrolment() => + [ + new() { Id = 1, StudentId = 1, CourseId = 1 }, + new() { Id = 2, StudentId = 1, CourseId = 8 }, + new() { Id = 3, StudentId = 1, CourseId = 12 }, + new() { Id = 4, StudentId = 2, CourseId = 2 }, + new() { Id = 5, StudentId = 2, CourseId = 3 }, + new() { Id = 6, StudentId = 3, CourseId = 7 }, + new() { Id = 7, StudentId = 3, CourseId = 1 }, + new() { Id = 8, StudentId = 4, CourseId = 9 }, + new() { Id = 9, StudentId = 5, CourseId = 9 }, + new() { Id = 10, StudentId = 6, CourseId = 6 }, + new() { Id = 11, StudentId = 6, CourseId = 5 }, + new() { Id = 12, StudentId = 6, CourseId = 11 }, + new() { Id = 13, StudentId = 7, CourseId = 9 }, + new() { Id = 14, StudentId = 8, CourseId = 12 }, + new() { Id = 15, StudentId = 8, CourseId = 7 }, + new() { Id = 16, StudentId = 9, CourseId = 1 }, + new() { Id = 17, StudentId = 9, CourseId = 10 }, + new() { Id = 18, StudentId = 10, CourseId = 4 }, + new() { Id = 19, StudentId = 10, CourseId = 10 }, + new() { Id = 20, StudentId = 10, CourseId = 8 } + ]; } diff --git a/csharp-linq/LINQInnerJoin/LinqInnerJoin/EnrolmentHelper.cs b/csharp-linq/LINQInnerJoin/LinqInnerJoin/EnrolmentHelper.cs index c44d356acb..2249e29f81 100644 --- a/csharp-linq/LINQInnerJoin/LinqInnerJoin/EnrolmentHelper.cs +++ b/csharp-linq/LINQInnerJoin/LinqInnerJoin/EnrolmentHelper.cs @@ -1,209 +1,295 @@ -namespace LinqInnerJoin +namespace LinqInnerJoin; + +public static class EnrolmentHelper { - public static class EnrolmentHelper + public static IEnumerable GetEnrolments( + IEnumerable enrolments) { - public static IEnumerable GetEnrolments( - IEnumerable enrolments) - { - var students = Student.GetDummyStudents(); + var students = Student.GetDummyStudents(); - var courses = Course.GetDummyCourses(); + var courses = Course.GetDummyCourses(); - var enrolmentsRelation = GetEnrolmentsRelation( - enrolments, - students, - courses); + var enrolmentsRelation = GetEnrolmentsRelation( + enrolments, + students, + courses); + + var result = enrolmentsRelation.Select( + e => + new + { + e.enrolmentStudentRelation.enrolment.Id, + StudentName = e.enrolmentStudentRelation.student.Name, + CourseName = e.course.Name, + } + ); + + return result; + } + + public static IEnumerable FilterEnrolments(IEnumerable enrolments) + { + var students = Student.GetDummyStudents(); + + var courses = Course.GetDummyCourses(); - var result = enrolmentsRelation.Select( + var enrolmentsRelation = GetEnrolmentsRelation(enrolments, students, courses); + + var result = enrolmentsRelation + .Select( e => new { e.enrolmentStudentRelation.enrolment.Id, StudentName = e.enrolmentStudentRelation.student.Name, + CourseId = e.course.Id, CourseName = e.course.Name, } - ); + ) + .Where(x => x.CourseId == 1); - return result; - } + return result; + } - public static IEnumerable FilterEnrolments(IEnumerable enrolments) - { - var students = Student.GetDummyStudents(); - - var courses = Course.GetDummyCourses(); - - var enrolmentsRelation = GetEnrolmentsRelation(enrolments, students, courses); - - var result = enrolmentsRelation - .Select( - e => - new - { - e.enrolmentStudentRelation.enrolment.Id, - StudentName = e.enrolmentStudentRelation.student.Name, - CourseId = e.course.Id, - CourseName = e.course.Name, - } - ) - .Where(x => x.CourseId == 1); - - return result; - } + public static IEnumerable> FilterAndGroupEnrolments( + IEnumerable enrolments) + { + var students = Student.GetDummyStudents(); - public static IEnumerable FilterAndGroupEnrolments( - IEnumerable enrolments) - { - var students = Student.GetDummyStudents(); + var courses = Course.GetDummyCourses(); - var courses = Course.GetDummyCourses(); + var enrolmentsRelation = GetEnrolmentsRelation( + enrolments, + students, + courses); - var enrolmentsRelation = GetEnrolmentsRelation( - enrolments, - students, - courses); - - var result = enrolmentsRelation - .Select( - e => - new - { - e.enrolmentStudentRelation.enrolment.Id, - StudentName = e.enrolmentStudentRelation.student.Name, - CourseId = e.course.Id, - CourseName = e.course.Name, - } - ) - .Where(x => x.CourseId < 5) - .GroupBy(x => x.CourseId); - - return result; - } + var result = enrolmentsRelation + .Select( + e => + new + { + e.enrolmentStudentRelation.enrolment.Id, + StudentName = e.enrolmentStudentRelation.student.Name, + CourseId = e.course.Id, + CourseName = e.course.Name, + } + ) + .Where(x => x.CourseId < 5) + .GroupBy(x => x.CourseId); - public static IEnumerable GetCoursesWithCategory( - IEnumerable courses) - { - var categories = Category.GetDummyCourseCategories(); + return result; + } - var courseWithCategory = - from course in courses - join category in categories on - course.CategoryId equals category.Id - select new - { - course.Id, - course.Name, - CategoryName = category.Name - }; + public static IEnumerable GetCoursesWithCategory( + IEnumerable courses) + { + var categories = Category.GetDummyCourseCategories(); - return courseWithCategory; - } + var courseWithCategory = + from course in courses + join category in categories on + course.CategoryId equals category.Id + select new + { + course.Id, + course.Name, + CategoryName = category.Name + }; - public static IEnumerable GetCoursesWithCategoryName( - IEnumerable courses) - { - var categories = Category.GetDummyCourseCategories(); + return courseWithCategory; + } - var courseWithCategoryName = courses.Join( - categories, - course => course.CategoryId, - category => category.Id, - (course, category) => new - { - course.Id, - course.Name, - CategoryName = category.Name - } - ); + public static IEnumerable GetCoursesWithCategoryName( + IEnumerable courses) + { + var categories = Category.GetDummyCourseCategories(); + + var courseWithCategoryName = courses.Join( + categories, + course => course.CategoryId, + category => category.Id, + (course, category) => new + { + course.Id, + course.Name, + CategoryName = category.Name + } + ); + + return courseWithCategoryName; + } + + public static IEnumerable<(Course Outer, Category Inner)> GetCourseCategoryPairs( + IEnumerable courses) + { + var categories = Category.GetDummyCourseCategories(); + + return courses.Join( + categories, + course => course.CategoryId, + category => category.Id); + } + + public static IEnumerable GetEnrolmentsWithGrade( + IEnumerable enrolments) + { + var grades = Grade.GetDummyGrades(); + + var enrolmentsWithGrade = + from enrolment in enrolments + join grade in grades on + new { enrolment.StudentId, enrolment.CourseId } + equals new { grade.StudentId, grade.CourseId } + select new + { + enrolment.Id, + enrolment.StudentId, + enrolment.CourseId, + grade.Mark + }; - return courseWithCategoryName; + return enrolmentsWithGrade; + } + + public static IEnumerable GetEnrolmentsWithGradeMethodSyntax( + IEnumerable enrolments) + { + var grades = Grade.GetDummyGrades(); + + return enrolments.Join( + grades, + enrolment => new { enrolment.StudentId, enrolment.CourseId }, + grade => new { grade.StudentId, grade.CourseId }, + (enrolment, grade) => new + { + enrolment.Id, + enrolment.StudentId, + enrolment.CourseId, + grade.Mark + }); + } + + public static IEnumerable GetEnrolmentCountPerCourse( + IEnumerable courses) + { + var enrolments = Enrolment.GetDummyEnrolment(); + + return courses.GroupJoin( + enrolments, + course => course.Id, + enrolment => enrolment.CourseId, + (course, courseEnrolments) => new + { + course.Name, + EnrolmentCount = courseEnrolments.Count() + }); + } + + public static void PrintCoursesWithCategory(IEnumerable courses) + { + foreach (var course in courses) + { + Console.WriteLine( + $"Id: {course.Id} " + + $"Course: {course.Name} " + + $"Category: {course.CategoryName}" + ); } + } - public static void PrintCoursesWithCategory(IEnumerable courses) + public static void PrintDummyCourses() + { + foreach (var course in Course.GetDummyCourses()) { - foreach (var course in courses) - { - Console.WriteLine( - $"Id: {course.Id} " + - $"Course: {course.Name} " + - $"Category: {course.CategoryName}" - ); - } + Console.WriteLine( + $"Id: {course.Id} " + + $"Course: {course.Name} " + + $"CategoryId: {course.CategoryId}" + ); } + } - public static void PrintDummyCourses() + public static void PrintDummyCategories() + { + foreach (var category in Category.GetDummyCourseCategories()) { - foreach (var course in Course.GetDummyCourses()) - { - Console.WriteLine( - $"Id: {course.Id} " + - $"Course: {course.Name} " + - $"CategoryId: {course.CategoryId}" - ); - } + Console.WriteLine( + $"Id: {category.Id} " + + $"Category: {category.Name}"); } + } - public static void PrintDummyCategories() + public static void PrintEnrolments(IEnumerable enrolments) + { + foreach (var enrolment in enrolments) { - foreach (var category in Category.GetDummyCourseCategories()) - { - Console.WriteLine( - $"Id: {category.Id} " + - $"Category: {category.Name} "); - } + Console.WriteLine( + $"Id: {enrolment.Id}, " + + $"Student Name: {enrolment.StudentName}, " + + $"Course: {enrolment.CourseName}" + ); } + } - public static void PrintEnrolments(IEnumerable enrolments) + public static void PrintEnrolmentsGroup( + IEnumerable> enrolmentGroups) + { + foreach (var group in enrolmentGroups) { - foreach (var enrolment in enrolments) + Console.WriteLine($"Enrolments for Course Id: {group.Key}"); + + foreach (var enrolment in group) { Console.WriteLine( - $"Id: {enrolment.Id}," + - $"Student Name: {enrolment.StudentName}," + - $"Course: {enrolment.CourseName} \n" + $"Id: {enrolment.Id}, " + + $"Student Name: {enrolment.StudentName}, " + + $"Course: {enrolment.CourseName}" ); } } + } - public static void PrintEnrolmentsGroup( - IEnumerable enrolmentGroups) + public static void PrintEnrolmentsWithGrade(IEnumerable enrolments) + { + foreach (var enrolment in enrolments) { - foreach (var group in enrolmentGroups) - { - Console.WriteLine($"Enrolments for Course Id: {group.Key} \n"); - - foreach (var enrolment in group) - { - Console.WriteLine( - $"Id: {enrolment.Id}," + - $"Student Name: {enrolment.StudentName}," + - $"Course: {enrolment.CourseName} \n" - ); - } - } + Console.WriteLine( + $"Enrolment: {enrolment.Id}, " + + $"StudentId: {enrolment.StudentId}, " + + $"CourseId: {enrolment.CourseId}, " + + $"Mark: {enrolment.Mark}" + ); } + } - private static IEnumerable GetEnrolmentsRelation( - IEnumerable enrolments, - IEnumerable students, - IEnumerable courses - ) + public static void PrintEnrolmentCountPerCourse(IEnumerable courses) + { + foreach (var course in courses) { - return enrolments - .Join( - students, - enrolment => enrolment.StudentId, - student => student.Id, - (enrolment, student) => new { enrolment, student } - ) - .Join( - courses, - enrolmentStudentRelation => - enrolmentStudentRelation.enrolment.CourseId, - course => course.Id, - (enrolmentStudentRelation, course) => - new { enrolmentStudentRelation, course } - ); + Console.WriteLine($"{course.Name}: {course.EnrolmentCount}"); } } + + private static IEnumerable GetEnrolmentsRelation( + IEnumerable enrolments, + IEnumerable students, + IEnumerable courses + ) + { + return enrolments + .Join( + students, + enrolment => enrolment.StudentId, + student => student.Id, + (enrolment, student) => new { enrolment, student } + ) + .Join( + courses, + enrolmentStudentRelation => + enrolmentStudentRelation.enrolment.CourseId, + course => course.Id, + (enrolmentStudentRelation, course) => + new { enrolmentStudentRelation, course } + ); + } } diff --git a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Grade.cs b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Grade.cs new file mode 100644 index 0000000000..c1a05c9044 --- /dev/null +++ b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Grade.cs @@ -0,0 +1,16 @@ +namespace LinqInnerJoin; + +public class Grade +{ + public int StudentId { get; set; } + public int CourseId { get; set; } + public string Mark { get; set; } = string.Empty; + + public static IEnumerable GetDummyGrades() => + [ + new() { StudentId = 1, CourseId = 1, Mark = "A" }, + new() { StudentId = 1, CourseId = 12, Mark = "B" }, + new() { StudentId = 3, CourseId = 7, Mark = "A" }, + new() { StudentId = 2, CourseId = 1, Mark = "C" } + ]; +} diff --git a/csharp-linq/LINQInnerJoin/LinqInnerJoin/LinqInnerJoin.csproj b/csharp-linq/LINQInnerJoin/LinqInnerJoin/LinqInnerJoin.csproj index 780397f264..0f99319f92 100644 --- a/csharp-linq/LINQInnerJoin/LinqInnerJoin/LinqInnerJoin.csproj +++ b/csharp-linq/LINQInnerJoin/LinqInnerJoin/LinqInnerJoin.csproj @@ -2,9 +2,13 @@ Exe - net7.0 + net11.0 enable enable + + + + diff --git a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Program.cs b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Program.cs index 4e6b3ac5c3..896c5f6116 100644 --- a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Program.cs +++ b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Program.cs @@ -1,47 +1,53 @@ -namespace LinqInnerJoin -{ - internal class Program - { - static void Main(string[] args) - { - //// print dummy courses - Console.WriteLine("\n-----the courses-----\n"); - EnrolmentHelper.PrintDummyCourses(); - //// print dummy categories - Console.WriteLine("\n-----the categories-----\n"); - EnrolmentHelper.PrintDummyCategories(); - - var coursesWithCategory = EnrolmentHelper.GetCoursesWithCategory( - Course.GetDummyCourses() - ); - - EnrolmentHelper.PrintCoursesWithCategory(coursesWithCategory); - - var coursesWithCategoryName = EnrolmentHelper.GetCoursesWithCategoryName( - Course.GetDummyCourses() - ); - - EnrolmentHelper.PrintCoursesWithCategory(coursesWithCategoryName); +using LinqInnerJoin; - var enrolments = EnrolmentHelper.GetEnrolments( - Enrolment.GetDummyEnrolment() - ); +Console.WriteLine("-----the courses-----"); +EnrolmentHelper.PrintDummyCourses(); - EnrolmentHelper.PrintEnrolments(enrolments); +Console.WriteLine("-----the categories-----"); +EnrolmentHelper.PrintDummyCategories(); - var filteredEnrolments = EnrolmentHelper.FilterEnrolments( - Enrolment.GetDummyEnrolment() - ); +Console.WriteLine("-----query syntax-----"); +var coursesWithCategory = EnrolmentHelper.GetCoursesWithCategory( + Course.GetDummyCourses()); +EnrolmentHelper.PrintCoursesWithCategory(coursesWithCategory); - EnrolmentHelper.PrintEnrolments(filteredEnrolments); +Console.WriteLine("-----method syntax-----"); +var coursesWithCategoryName = EnrolmentHelper.GetCoursesWithCategoryName( + Course.GetDummyCourses()); +EnrolmentHelper.PrintCoursesWithCategory(coursesWithCategoryName); - var filteredAndGroupedEnrolments = EnrolmentHelper.FilterAndGroupEnrolments( - Enrolment.GetDummyEnrolment() - ); - - EnrolmentHelper.PrintEnrolmentsGroup(filteredAndGroupedEnrolments); - - Console.ReadKey(); - } - } +Console.WriteLine("-----tuple join-----"); +var pairs = EnrolmentHelper.GetCourseCategoryPairs(Course.GetDummyCourses()); +foreach (var (course, category) in pairs.Take(3)) +{ + Console.WriteLine($"{course.Name} is a {category.Name}"); } + +Console.WriteLine("-----enrolments-----"); +var enrolments = EnrolmentHelper.GetEnrolments( + Enrolment.GetDummyEnrolment()); +EnrolmentHelper.PrintEnrolments(enrolments); + +Console.WriteLine("-----filtered enrolments-----"); +var filteredEnrolments = EnrolmentHelper.FilterEnrolments( + Enrolment.GetDummyEnrolment()); +EnrolmentHelper.PrintEnrolments(filteredEnrolments); + +Console.WriteLine("-----enrolments with grade-----"); +var enrolmentsWithGrade = EnrolmentHelper.GetEnrolmentsWithGrade( + Enrolment.GetDummyEnrolment()); +EnrolmentHelper.PrintEnrolmentsWithGrade(enrolmentsWithGrade); + +Console.WriteLine("-----enrolments with grade, method syntax-----"); +EnrolmentHelper.PrintEnrolmentsWithGrade( + EnrolmentHelper.GetEnrolmentsWithGradeMethodSyntax(Enrolment.GetDummyEnrolment())); + +Console.WriteLine("-----filtered and grouped-----"); +var filteredAndGroupedEnrolments = EnrolmentHelper.FilterAndGroupEnrolments( + Enrolment.GetDummyEnrolment()); +EnrolmentHelper.PrintEnrolmentsGroup(filteredAndGroupedEnrolments); + +Console.WriteLine("-----group join-----"); +var enrolmentCounts = EnrolmentHelper.GetEnrolmentCountPerCourse( + Course.GetDummyCourses()); +EnrolmentHelper.PrintEnrolmentCountPerCourse(enrolmentCounts); diff --git a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Student.cs b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Student.cs index 32408ec68c..2c67e86477 100644 --- a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Student.cs +++ b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Student.cs @@ -1,40 +1,21 @@ -namespace LinqInnerJoin -{ - public class Student - { - public int Id { get; set; } - public string Name { get; set; } - - public static IEnumerable GetDummyStudents() - { - var studentNames = new List - { - "John", - "Abhi", - "Rahul", - "Nisha", - "Mike", - "Joana", - "Nick", - "Julie", - "Anita", - "Jenny" - }; - - var students = new List(); +namespace LinqInnerJoin; - for (var i = 0; i < 10; i++) - { - var student = new Student - { - Id = i + 1, - Name = studentNames[i] - }; - - students.Add(student); - } +public class Student +{ + public int Id { get; set; } + public string Name { get; set; } = string.Empty; - return students; - } - } + public static IEnumerable GetDummyStudents() => + [ + new() { Id = 1, Name = "John" }, + new() { Id = 2, Name = "Abhi" }, + new() { Id = 3, Name = "Rahul" }, + new() { Id = 4, Name = "Nisha" }, + new() { Id = 5, Name = "Mike" }, + new() { Id = 6, Name = "Joana" }, + new() { Id = 7, Name = "Nick" }, + new() { Id = 8, Name = "Julie" }, + new() { Id = 9, Name = "Anita" }, + new() { Id = 10, Name = "Jenny" } + ]; } diff --git a/csharp-linq/LINQInnerJoin/Tests/LinqInnerJoinUnitTest.cs b/csharp-linq/LINQInnerJoin/Tests/LinqInnerJoinUnitTest.cs index 9c6ca32d22..43a85e8118 100644 --- a/csharp-linq/LINQInnerJoin/Tests/LinqInnerJoinUnitTest.cs +++ b/csharp-linq/LINQInnerJoin/Tests/LinqInnerJoinUnitTest.cs @@ -1,147 +1,184 @@ -using FluentAssertions; -using LinqInnerJoin; +using LinqInnerJoin; using Xunit; -namespace Tests + +namespace Tests; + +public class LinqInnerJoinUnitTest { - public class LinqInnerJoinUnitTest + [Fact] + public void WhenFetchingCourses_ThenGetCoursesWithCategoryName() { - [Fact] - public void WhenFetchingCourses_ThenGetCoursesWithCategoryName() + var courses = new List + { + new() { Id = 1, Name = "C#", CategoryId = 1 }, + new() { Id = 2, Name = "Docker", CategoryId = 2 }, + new() { Id = 3, Name = "Python", CategoryId = 1 }, + }; + + var result = EnrolmentHelper.GetCoursesWithCategoryName(courses) + .Select(c => ((int)c.Id, (string)c.Name, (string)c.CategoryName)) + .ToList(); + + var expectedResult = new List<(int, string, string)> + { + (1, "C#", "Programming Language"), + (2, "Docker", "DevOps"), + (3, "Python", "Programming Language"), + }; + + Assert.Equal(expectedResult, result); + } + + [Fact] + public void WhenFetchingCourses_ThenGetCoursesWithCategory() + { + var courses = new List + { + new() { Id = 1, Name = "C#", CategoryId = 1 }, + new() { Id = 2, Name = "Docker", CategoryId = 2 }, + new() { Id = 3, Name = "SQL", CategoryId = 3 }, + new() { Id = 4, Name = "Jenkins", CategoryId = 2 }, + }; + + var result = EnrolmentHelper.GetCoursesWithCategory(courses) + .Select(c => ((int)c.Id, (string)c.Name, (string)c.CategoryName)) + .ToList(); + + var expectedResult = new List<(int, string, string)> { - var courses = new List - { - new Course { Id = 1, Name = "C#", CategoryId = 1 }, - new Course { Id = 2, Name = "Docker", CategoryId = 2 }, - new Course { Id = 3, Name = "Python", CategoryId = 1 }, - }; - - var result = EnrolmentHelper.GetCoursesWithCategoryName(courses).ToList(); - - var expectedResult = new List - { - new { Id = 1, Name = "C#", CategoryName = "Programming Language" }, - new { Id = 2, Name = "Docker", CategoryName = "DevOps" }, - new { Id = 3, Name = "Python", CategoryName = "Programming Language" }, - }; - - result.Should().BeEquivalentTo(expectedResult); - } - - [Fact] - public void WhenFetchingCourses_ThenGetCoursesWithCategory() + (1, "C#", "Programming Language"), + (2, "Docker", "DevOps"), + (3, "SQL", "Database System"), + (4, "Jenkins", "DevOps"), + }; + + Assert.Equal(expectedResult, result); + } + + [Fact] + public void WhenCourseHasUnknownCategory_ThenInnerJoinDropsIt() + { + var courses = new List + { + new() { Id = 1, Name = "C#", CategoryId = 1 }, + new() { Id = 2, Name = "COBOL", CategoryId = 99 }, + }; + + var result = EnrolmentHelper.GetCoursesWithCategory(courses).ToList(); + + var course = Assert.Single(result); + Assert.Equal("C#", (string)course.Name); + } + + [Fact] + public void WhenJoiningWithoutResultSelector_ThenGetTuples() + { + var courses = new List + { + new() { Id = 1, Name = "C#", CategoryId = 1 }, + new() { Id = 2, Name = "Docker", CategoryId = 2 }, + }; + + var result = EnrolmentHelper.GetCourseCategoryPairs(courses) + .Select(pair => (pair.Outer.Name, pair.Inner.Name)) + .ToList(); + + Assert.Equal([("C#", "Programming Language"), ("Docker", "DevOps")], result); + } + + [Fact] + public void WhenFetchingEnrolments_ThenFetchWithStudentAndCourseName() + { + var enrolments = new List { - var courses = new List - { - new Course { Id = 1, Name = "C#", CategoryId = 1 }, - new Course { Id = 2, Name = "Docker", CategoryId = 2 }, - new Course { Id = 3, Name = "SQL", CategoryId = 3 }, - new Course { Id = 4, Name = "Jenkins", CategoryId = 2 }, - }; - - var result = EnrolmentHelper.GetCoursesWithCategory(courses).ToList(); - - var expectedResult = new List - { - new { Id = 1, Name = "C#", CategoryName = "Programming Language" }, - new { Id = 2, Name = "Docker", CategoryName = "DevOps" }, - new { Id = 3, Name = "SQL", CategoryName = "Database System" }, - new { Id = 4, Name = "Jenkins", CategoryName = "DevOps" }, - }; - - result.Should().BeEquivalentTo(expectedResult); - } - - [Fact] - public void WhenFetchingEnrolments_ThenFetchWithStudentAndCourseName() + new() { Id = 1, StudentId = 1, CourseId = 1 }, + new() { Id = 2, StudentId = 2, CourseId = 6 }, + new() { Id = 3, StudentId = 3, CourseId = 8 }, + }; + + var result = EnrolmentHelper.GetEnrolments(enrolments) + .Select(e => ((int)e.Id, (string)e.StudentName, (string)e.CourseName)) + .ToList(); + + var expectedResult = new List<(int, string, string)> { - var enrolments = new List - { - new Enrolment { Id = 1, StudentId = 1, CourseId = 1 }, - new Enrolment { Id = 2, StudentId = 2, CourseId = 6 }, - new Enrolment { Id = 3, StudentId = 3, CourseId = 8 }, - }; - - var result = EnrolmentHelper.GetEnrolments(enrolments).ToList(); - - var expectedResult = new List - { - new { Id = 1, StudentName = "John", CourseName = "CSHARP" }, - new { Id = 2, StudentName = "Abhi", CourseName = "MSSQL" }, - new { Id = 3, StudentName = "Rahul", CourseName = "MONGODB" }, - }; - - result.Should().BeEquivalentTo(expectedResult); - } - - [Fact] - public void WhenFilterEnrolments_ThenReturnsCorrectData() + (1, "John", "CSHARP"), + (2, "Abhi", "MSSQL"), + (3, "Rahul", "MONGODB"), + }; + + Assert.Equal(expectedResult, result); + } + + [Fact] + public void WhenFilterEnrolments_ThenReturnsCorrectData() + { + var enrolments = new List { - IEnumerable enrolments = new List - { - new Enrolment { Id = 1, StudentId = 1, CourseId = 1 }, - new Enrolment { Id = 2, StudentId = 2, CourseId = 2 }, - new Enrolment { Id = 3, StudentId = 3, CourseId = 1 }, - }; - - var expected = new List - { - new { Id = 1, StudentName = "John", CourseId = 1, CourseName = "CSHARP" }, - new { Id = 3, StudentName = "Rahul", CourseId = 1, CourseName = "CSHARP" }, - }; - - var actual = EnrolmentHelper.FilterEnrolments(enrolments).ToList(); - - actual.Should().BeEquivalentTo(expected); - } - - [Fact] - public void WhenFilterAndGroupEnrolments_ThenReturnCorrectData() + new() { Id = 1, StudentId = 1, CourseId = 1 }, + new() { Id = 2, StudentId = 2, CourseId = 2 }, + new() { Id = 3, StudentId = 3, CourseId = 1 }, + }; + + var expected = new List<(int, string, int, string)> { - IEnumerable enrolments = Enrolment.GetDummyEnrolment(); - - var result = EnrolmentHelper.FilterAndGroupEnrolments(enrolments).ToList(); - - result.Should().NotBeNull(); - - var expectedGroupCount = 4; - var actualGroupCount = result.Count(); - actualGroupCount.Should().Be(expectedGroupCount); - - int[] expectedGroupSizes = { 3, 1, 1, 1 }; - var index = 0; - - foreach (var group in result) - { - int expectedSize = expectedGroupSizes[index]; - int actualSize = Enumerable.Count(group); - actualSize.Should().Be(expectedSize); - - index++; - } - - var expectedResult = new List> - { - new List - { - new { Id = 1, StudentName = "John", CourseId = 1, CourseName = "CSHARP" }, - new { Id = 7, StudentName = "Rahul", CourseId = 1, CourseName = "CSHARP" }, - new { Id = 16, StudentName = "Anita", CourseId = 1, CourseName = "CSHARP" } - }, - new List - { - new { Id = 4, StudentName = "Abhi", CourseId = 2, CourseName = "PYTHON" } - }, - new List - { - new { Id = 5, StudentName = "Abhi", CourseId = 3, CourseName = "JAVA" } - }, - new List - { - new { Id = 18, StudentName = "Jenny", CourseId = 4, CourseName = "RUBY" } - } - }; - - result.Should().BeEquivalentTo(expectedResult); - } + (1, "John", 1, "CSHARP"), + (3, "Rahul", 1, "CSHARP"), + }; + + var actual = EnrolmentHelper.FilterEnrolments(enrolments) + .Select(e => ((int)e.Id, (string)e.StudentName, (int)e.CourseId, (string)e.CourseName)) + .ToList(); + + Assert.Equal(expected, actual); + } + + [Fact] + public void WhenFilterAndGroupEnrolments_ThenReturnCorrectData() + { + var enrolments = Enrolment.GetDummyEnrolment(); + + var result = EnrolmentHelper.FilterAndGroupEnrolments(enrolments).ToList(); + + var actual = result + .Select(group => ((int)group.Key, + group + .Select(e => ((int)e.Id, (string)e.StudentName, (string)e.CourseName)) + .ToList())) + .ToList(); + + Assert.Equal([1, 2, 3, 4], actual.Select(group => group.Item1)); + Assert.Equal([(1, "John", "CSHARP"), (7, "Rahul", "CSHARP"), (16, "Anita", "CSHARP")], actual[0].Item2); + Assert.Equal([(4, "Abhi", "PYTHON")], actual[1].Item2); + Assert.Equal([(5, "Abhi", "JAVA")], actual[2].Item2); + Assert.Equal([(18, "Jenny", "RUBY")], actual[3].Item2); + } + + [Fact] + public void WhenJoiningOnCompositeKey_ThenOnlyMatchingPairsReturn() + { + var enrolments = Enrolment.GetDummyEnrolment(); + + var querySyntax = EnrolmentHelper.GetEnrolmentsWithGrade(enrolments) + .Select(e => ((int)e.Id, (string)e.Mark)) + .ToList(); + var methodSyntax = EnrolmentHelper.GetEnrolmentsWithGradeMethodSyntax(enrolments) + .Select(e => ((int)e.Id, (string)e.Mark)) + .ToList(); + + Assert.Equal([(1, "A"), (3, "B"), (6, "A")], querySyntax); + Assert.Equal(querySyntax, methodSyntax); + } + + [Fact] + public void WhenGroupJoining_ThenEveryCourseAppearsOnce() + { + var result = EnrolmentHelper.GetEnrolmentCountPerCourse(Course.GetDummyCourses()) + .Select(c => ((string)c.Name, (int)c.EnrolmentCount)) + .ToList(); + + Assert.Equal(13, result.Count); + Assert.Contains(("KUBERNETES", 0), result); + Assert.Contains(("CSHARP", 3), result); } } diff --git a/csharp-linq/LINQInnerJoin/Tests/Tests.csproj b/csharp-linq/LINQInnerJoin/Tests/Tests.csproj index 2f4b744333..b1bd3a7d96 100644 --- a/csharp-linq/LINQInnerJoin/Tests/Tests.csproj +++ b/csharp-linq/LINQInnerJoin/Tests/Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net11.0 enable enable @@ -9,14 +9,13 @@ - - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all From ef8a5a2f5f1d38a5fdbe8e588905af51528795ca Mon Sep 17 00:00:00 2001 From: Vladimir Pecanac Date: Sat, 14 Nov 2026 14:25:43 +0100 Subject: [PATCH 2/2] LINQInnerJoin: match the article's formatting in Program.cs and GetEnrolmentsRelation --- csharp-linq/LINQInnerJoin/LinqInnerJoin/EnrolmentHelper.cs | 3 +-- csharp-linq/LINQInnerJoin/LinqInnerJoin/Program.cs | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/csharp-linq/LINQInnerJoin/LinqInnerJoin/EnrolmentHelper.cs b/csharp-linq/LINQInnerJoin/LinqInnerJoin/EnrolmentHelper.cs index 2249e29f81..30628d30c8 100644 --- a/csharp-linq/LINQInnerJoin/LinqInnerJoin/EnrolmentHelper.cs +++ b/csharp-linq/LINQInnerJoin/LinqInnerJoin/EnrolmentHelper.cs @@ -273,8 +273,7 @@ public static void PrintEnrolmentCountPerCourse(IEnumerable courses) private static IEnumerable GetEnrolmentsRelation( IEnumerable enrolments, IEnumerable students, - IEnumerable courses - ) + IEnumerable courses) { return enrolments .Join( diff --git a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Program.cs b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Program.cs index 896c5f6116..3e6df2a441 100644 --- a/csharp-linq/LINQInnerJoin/LinqInnerJoin/Program.cs +++ b/csharp-linq/LINQInnerJoin/LinqInnerJoin/Program.cs @@ -18,6 +18,7 @@ Console.WriteLine("-----tuple join-----"); var pairs = EnrolmentHelper.GetCourseCategoryPairs(Course.GetDummyCourses()); + foreach (var (course, category) in pairs.Take(3)) { Console.WriteLine($"{course.Name} is a {category.Name}");