Fix GetSubjectInCurriculumByCurriculumId

Author: Dacoband

FPTStella/FPTStella.Application/Services/SubjectInCurriculumService.cs

@@ -15,28 +15,46 @@ public class SubjectInCurriculumService : ISubjectInCurriculumService
     {
         private readonly IUnitOfWork _unitOfWork;
         private readonly ISubjectInCurriculumRepository _subjectInCurriculumRepository;
-        /// <summary>
+        private readonly ISubjectRepository _subjectRepository;
         /// Initializes a new instance of the SubjectInCurriculumService class.
         /// </summary>
         /// <param name="unitOfWork">The unit of work</param>
         /// <param name="subjectInCurriculumRepository">The subject in curriculum repository</param>
-        public SubjectInCurriculumService(IUnitOfWork unitOfWork, ISubjectInCurriculumRepository subjectInCurriculumRepository)
+        /// <param name="subjectRepository">The subject repository</param>
+        public SubjectInCurriculumService(
+            IUnitOfWork unitOfWork,
+            ISubjectInCurriculumRepository subjectInCurriculumRepository,
+            ISubjectRepository subjectRepository)
         {
             _unitOfWork = unitOfWork ?? throw new ArgumentNullException(nameof(unitOfWork));
             _subjectInCurriculumRepository = subjectInCurriculumRepository ?? throw new ArgumentNullException(nameof(subjectInCurriculumRepository));
+            _subjectRepository = subjectRepository ?? throw new ArgumentNullException(nameof(subjectRepository));
         }
 
         /// <summary>
         /// Maps a SubjectInCurriculum entity to its DTO representation.
         /// </summary>
         /// <param name="entity">The SubjectInCurriculum entity</param>
         /// <returns>A mapped SubjectInCurriculumDto object</returns>
-        private static SubjectInCurriculumDto MapToDto(SubjectInCurriculum entity) => new()
+        private async Task<SubjectInCurriculumDto> MapToDtoAsync(SubjectInCurriculum entity)
         {
-            Id = entity.Id,
-            CurriculumId = entity.CurriculumId,
-            SubjectId = entity.SubjectId
-        };
+            var dto = new SubjectInCurriculumDto
+            {
+                Id = entity.Id,
+                CurriculumId = entity.CurriculumId,
+                SubjectId = entity.SubjectId
+            };
+
+            // Fetch the subject details
+            var subject = await _subjectRepository.GetByIdAsync(entity.SubjectId.ToString());
+            if (subject != null && !subject.DelFlg)
+            {
+                dto.SubjectCode = subject.SubjectCode;
+                dto.SubjectName = subject.SubjectName;
+            }
+
+            return dto;
+        }
 
         /// <summary>
         /// Creates a new mapping between a subject and a curriculum.
@@ -62,7 +80,7 @@ public async Task<SubjectInCurriculumDto> CreateMappingAsync(CreateSubjectInCurr
             await _subjectInCurriculumRepository.InsertAsync(mapping);
             await _unitOfWork.SaveAsync();
 
-            return MapToDto(mapping);
+            return await MapToDtoAsync(mapping);
         }
 
         /// <summary>
@@ -125,7 +143,7 @@ public async Task<SubjectInCurriculumDto> GetMappingByIdAsync(Guid id)
                 throw new KeyNotFoundException($"Subject-Curriculum mapping with ID {id} not found.");
             }
 
-            return MapToDto(mapping);
+            return await MapToDtoAsync(mapping);
         }
 
         /// <summary>
@@ -135,7 +153,14 @@ public async Task<SubjectInCurriculumDto> GetMappingByIdAsync(Guid id)
         public async Task<List<SubjectInCurriculumDto>> GetAllMappingsAsync()
         {
             var mappings = await _subjectInCurriculumRepository.FilterByAsync(m => !m.DelFlg);
-            return mappings.Select(MapToDto).ToList();
+            var result = new List<SubjectInCurriculumDto>();
+
+            foreach (var mapping in mappings)
+            {
+                result.Add(await MapToDtoAsync(mapping));
+            }
+
+            return result;
         }
 
         /// <summary>
@@ -146,7 +171,14 @@ public async Task<List<SubjectInCurriculumDto>> GetAllMappingsAsync()
         public async Task<List<SubjectInCurriculumDto>> GetMappingsByCurriculumIdAsync(Guid curriculumId)
         {
             var mappings = await _subjectInCurriculumRepository.GetByCurriculumIdAsync(curriculumId);
-            return mappings.Select(MapToDto).ToList();
+            var result = new List<SubjectInCurriculumDto>();
+
+            foreach (var mapping in mappings)
+            {
+                result.Add(await MapToDtoAsync(mapping));
+            }
+
+            return result;
         }
 
         /// <summary>
@@ -157,7 +189,14 @@ public async Task<List<SubjectInCurriculumDto>> GetMappingsByCurriculumIdAsync(G
         public async Task<List<SubjectInCurriculumDto>> GetMappingsBySubjectIdAsync(Guid subjectId)
         {
             var mappings = await _subjectInCurriculumRepository.GetBySubjectIdAsync(subjectId);
-            return mappings.Select(MapToDto).ToList();
+            var result = new List<SubjectInCurriculumDto>();
+
+            foreach (var mapping in mappings)
+            {
+                result.Add(await MapToDtoAsync(mapping));
+            }
+
+            return result;
         }
 
         /// <summary>

FPTStella/FPTStella.Application/Services/SubjectToolService.cs

@@ -235,7 +235,6 @@ public async Task<UpdateSubjectToolResultDto> UpdateMappingsAsync(UpdateSubjectT
             var updatedMappings = new List<UpdateSubjectToolDto>();
             var failedMappings = new List<(UpdateSubjectToolDto Mapping, string Reason)>();
 
-            // Validate Subject and Tool existence in batch
             var allSubjectIds = updateMappingBatchDto.Mappings
                 .SelectMany(m => new[] { m.SubjectId, m.NewSubjectId })
                 .Where(id => id.HasValue && id.Value != Guid.Empty)
@@ -272,15 +271,13 @@ public async Task<UpdateSubjectToolResultDto> UpdateMappingsAsync(UpdateSubjectT
             {
                 try
                 {
-                    // Validate the existing mapping
                     var existingMapping = await _subjectToolRepository.GetMappingAsync(mappingDto.SubjectId, mappingDto.ToolId);
                     if (existingMapping == null)
                     {
                         failedMappings.Add((mappingDto, $"Mapping between Subject ID {mappingDto.SubjectId} and Tool ID {mappingDto.ToolId} does not exist."));
                         continue;
                     }
 
-                    // Validate new Subject ID if provided
                     if (mappingDto.NewSubjectId.HasValue && mappingDto.NewSubjectId.Value != Guid.Empty)
                     {
                         if (!existingSubjects.TryGetValue(mappingDto.NewSubjectId.Value, out var subjectExists) || !subjectExists)

FPTStella/FPTStella.Contracts/DTOs/SubjectInCurriculums/SubjectInCurriculumDto.cs

@@ -22,5 +22,7 @@ public class SubjectInCurriculumDto
         /// Gets or sets the subject ID.
         /// </summary>
         public Guid SubjectId { get; set; }
+        public string SubjectCode { get; set; } = string.Empty;
+        public string SubjectName { get; set; } = string.Empty;
     }
 }