diff --git a/src/Server/Services/DatabaseService/Resume.cs b/src/Server/Services/DatabaseService/Resume.cs index 8a152dc..2a88464 100644 --- a/src/Server/Services/DatabaseService/Resume.cs +++ b/src/Server/Services/DatabaseService/Resume.cs @@ -115,10 +115,10 @@ namespace BoredCareers.Services.DatabaseService { Task ResumeSkillReader = ResumeSkillCommand.ExecuteReaderAsync(); Task ResumeLanguageReader = ResumeLanguageCommand.ExecuteReaderAsync(); Task ResumeCertificationReader = ResumeCertificationCommand.ExecuteReaderAsync(); - Task ResumeProjectnReader = ResumeProjectCommand.ExecuteReaderAsync(); + Task ResumeProjectReader = ResumeProjectCommand.ExecuteReaderAsync(); await Task.WhenAll(resumeReader, ResumeExperienceReader, ResumeExperienceBulletReader, ResumeMilitaryReader, ResumeMilitaryBulletReader, - ResumeEducationReader, ResumeSkillReader, ResumeLanguageReader, ResumeCertificationReader, ResumeProjectnReader); + ResumeEducationReader, ResumeSkillReader, ResumeLanguageReader, ResumeCertificationReader, ResumeProjectReader); using (DbDataReader reader = await resumeReader) { while (await reader.ReadAsync()) { @@ -307,16 +307,63 @@ namespace BoredCareers.Services.DatabaseService { } using (DbDataReader reader = await ResumeLanguageReader) { - + List? languages = new List(); + while (await reader.ReadAsync()) { + if (reader == null) { break; } + int _id = reader.GetInt32("ID"); + int _resumeid = reader.GetInt32("ResumeID"); + string _language = reader.GetString("Language"); + string _proficiency = reader.GetString("Proficiency"); + languages.Add( new ResumeLanguage { + ID = _id, + ResumeID = _resumeid, + Language = _language, + Proficiency = _proficiency + } ); + } + resume.Languages = languages.ToArray(); } using (DbDataReader reader = await ResumeCertificationReader) { - + List? certs = new List(); + while (await reader.ReadAsync()) { + if (reader == null) { break; } + int _id = reader.GetInt32("ID"); + int _resumeid = reader.GetInt32("ResumeID"); + string _name = reader.GetString("Name"); + string _url = reader.GetString("VerificationURL"); + string _description = reader.GetString("Description"); + certs.Add( new ResumeCertification { + ID = _id, + ResumeID = _resumeid, + Name = _name, + VerificationURL = _url, + Description = _description + } ); + } + resume.Certification = certs.ToArray(); } - using (DbDataReader reader = await ResumeProjectnReader) { - + using (DbDataReader reader = await ResumeProjectReader) { + List? projects = new List(); + while (await reader.ReadAsync()) { + if (reader == null) { break; } + int _id = reader.GetInt32("ID"); + int _resumeid = reader.GetInt32("ResumeID"); + string _name = reader.GetString("Name"); + string _url = reader.GetString("URL"); + string _description = reader.GetString("Description"); + projects.Add( new ResumeProject { + ID = _id, + ResumeID = _resumeid, + Name = _name, + URL = _url, + Description = _description + } ); + } + resume.Projects = projects.ToArray(); } + return resume; }