Index: iknow-api/Controllers/AdminController.cs =================================================================== --- iknow-api/Controllers/AdminController.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,119 +1,0 @@ -using System.Security.Claims; -using iknow_api.DTOs; -using iknow_api.Services; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace iknow_api.Controllers -{ - /// - /// UC012 subjects, UC013 active semesters, UC014 professor assignments. - /// Every action requires the admin role, checked against the validated token. - /// - [ApiController] - [Route("api/[controller]")] - [Authorize] - public class AdminController : ControllerBase - { - private readonly IAdminService _adminService; - - public AdminController(IAdminService adminService) - { - _adminService = adminService; - } - - // ---------- UC012 ---------- - - [HttpGet("subjects")] - public async Task GetSubjects() => - RequireAdmin(out var error) ? Ok(await _adminService.GetSubjectsAsync()) : error; - - [HttpPost("subjects")] - public async Task CreateSubject([FromBody] SubjectWriteDto request) => - RequireAdmin(out var error) ? Result(await _adminService.CreateSubjectAsync(request)) : error; - - [HttpPut("subjects/{id:int}")] - public async Task UpdateSubject(int id, [FromBody] SubjectWriteDto request) => - RequireAdmin(out var error) ? Result(await _adminService.UpdateSubjectAsync(id, request)) : error; - - [HttpDelete("subjects/{id:int}")] - public async Task DeleteSubject(int id) => - RequireAdmin(out var error) ? Result(await _adminService.DeleteSubjectAsync(id)) : error; - - [HttpPost("subjects/{id:int}/majors")] - public async Task LinkMajor(int id, [FromBody] MajorLinkDto request) => - RequireAdmin(out var error) ? Result(await _adminService.LinkMajorAsync(id, request)) : error; - - [HttpDelete("subjects/{id:int}/majors/{majorId:int}")] - public async Task UnlinkMajor(int id, int majorId) => - RequireAdmin(out var error) ? Result(await _adminService.UnlinkMajorAsync(id, majorId)) : error; - - [HttpPost("subjects/{id:int}/prerequisites")] - public async Task AddPrerequisite(int id, [FromBody] PrerequisiteDto request) => - RequireAdmin(out var error) ? Result(await _adminService.AddPrerequisiteAsync(id, request)) : error; - - [HttpDelete("subjects/{id:int}/prerequisites/{dependencyId:int}")] - public async Task RemovePrerequisite(int id, int dependencyId) => - RequireAdmin(out var error) ? Result(await _adminService.RemovePrerequisiteAsync(id, dependencyId)) : error; - - // ---------- UC013 ---------- - - [HttpGet("semesters")] - public async Task GetSemesters() => - RequireAdmin(out var error) ? Ok(await _adminService.GetSemestersAsync()) : error; - - [HttpPost("semesters")] - public async Task CreateSemester([FromBody] SemesterWriteDto request) => - RequireAdmin(out var error) ? Result(await _adminService.CreateSemesterAsync(request)) : error; - - // ---------- UC014 ---------- - - [HttpGet("schedule/{semesterId:int}")] - public async Task GetSchedule(int semesterId) - { - if (!RequireAdmin(out var error)) return error; - - var schedule = await _adminService.GetScheduleAsync(semesterId); - return schedule is null - ? NotFound(new AdminResultDto { Ok = false, Message = "Semester not found." }) - : Ok(schedule); - } - - [HttpPost("schedule")] - public async Task Assign([FromBody] ScheduleWriteDto request) => - RequireAdmin(out var error) ? Result(await _adminService.AssignAsync(request)) : error; - - [HttpDelete("schedule")] - public async Task Unassign([FromBody] ScheduleWriteDto request) => - RequireAdmin(out var error) ? Result(await _adminService.UnassignAsync(request)) : error; - - // ---------- shared ---------- - - [HttpGet("majors")] - public async Task GetMajors() => - RequireAdmin(out var error) ? Ok(await _adminService.GetMajorsAsync()) : error; - - private IActionResult Result(AdminResultDto result) => - result.Ok ? Ok(result) : BadRequest(result); - - /// - /// The role comes from the validated token, so it cannot be set by the caller. - /// - private bool RequireAdmin(out IActionResult error) - { - var role = User.FindFirst(ClaimTypes.Role)?.Value ?? User.FindFirst("role")?.Value; - if (!string.Equals(role, nameof(Models.UserRole.Admin), StringComparison.OrdinalIgnoreCase)) - { - error = StatusCode(403, new AdminResultDto - { - Ok = false, - Message = "This endpoint is for administrators." - }); - return false; - } - - error = Ok(); - return true; - } - } -} Index: iknow-api/Controllers/AuthController.cs =================================================================== --- iknow-api/Controllers/AuthController.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,86 +1,0 @@ -using iknow_api.DTOs; -using iknow_api.Services; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace iknow_api.Controllers -{ - [ApiController] - [Route("api/[controller]")] - public class AuthController : ControllerBase - { - private readonly IAuthService _authService; - private readonly IRefreshTokenService _refreshTokenService; - - public AuthController(IAuthService authService, IRefreshTokenService refreshTokenService) - { - _authService = authService; - _refreshTokenService = refreshTokenService; - } - - [HttpGet("testdb")] - public async Task TestDb() - { - try - { - var count = await _authService.GetUsersCountAsync(); - return Ok(new { message = "DB connection works!", usersCount = count }); - } - catch (Exception ex) - { - return BadRequest(new { message = "DB connection failed", error = ex.Message }); - } - } - - [HttpPost("register")] - public async Task Register([FromBody] RegisterDto request) - { - try - { - await _authService.RegisterAsync(request); - return Ok("User registered successfully"); - } - catch (InvalidOperationException ex) - { - return BadRequest(new { message = ex.Message }); - } - catch (Exception ex) - { - return StatusCode(500, new { message = "An error occurred during registration", error = ex.Message }); - } - } - - [HttpPost("login")] - public async Task Login([FromBody] LoginDto request) - { - var result = await _authService.LoginAsync(request); - if (result == null) return Unauthorized("Invalid credentials"); - - return Ok(new - { - token = result.AccessToken, - refreshToken = result.RefreshToken, - role = result.Role - }); - } - - [Authorize] - [HttpGet("getstring")] - public IActionResult getstring() - { - return Ok(new { message = "You are authorized!" }); - } - - [HttpPost("verify-user-token")] - public async Task VerifyToken([FromBody] VerifyRefreshTokenDto verifyRefreshToken) - { - if (await _refreshTokenService.VerifyRefreshToken(verifyRefreshToken)) - { - return Ok(await _authService.GenerateNewJWT(verifyRefreshToken)); - } - - return BadRequest(new { message = "No token found!" }); - } - - } -} Index: iknow-api/Controllers/DbHealthController.cs =================================================================== --- iknow-api/Controllers/DbHealthController.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,49 +1,0 @@ -using iknow_api.Data; -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; - -namespace iknow_api.Controllers; - -[ApiController] -[Route("[controller]")] -public class DbHealthController(AppDbContext db) : ControllerBase -{ - /// - /// Verifies that the SSH tunnel is up, the DB credentials work, and that - /// the entity mapping matches the schema created by sql/ddl.sql. - /// - [HttpGet] - public async Task Get() - { - try - { - // EF projects SqlQuery onto a column named "Value", hence the alias. - var version = await db.Database - .SqlQuery($"SELECT version() AS \"Value\"") - .SingleAsync(); - - return Ok(new - { - connected = true, - server = version, - counts = new - { - users = await db.User.CountAsync(), - subjects = await db.Subjects.CountAsync(), - enrolledSemesters = await db.EnrolledSemesters.CountAsync(), - semesterSubjects = await db.SemesterSubjects.CountAsync(), - passedSubjects = await db.PassedSubjects.CountAsync(), - } - }); - } - catch (Exception ex) - { - return StatusCode(503, new - { - connected = false, - error = ex.Message, - hint = "Is tunnel_scripta.cmd running and listening on localhost:9999?" - }); - } - } -} Index: iknow-api/Controllers/EnrollmentController.cs =================================================================== --- iknow-api/Controllers/EnrollmentController.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,78 +1,0 @@ -using System.Security.Claims; -using iknow_api.DTOs; -using iknow_api.Services; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace iknow_api.Controllers -{ - [ApiController] - [Route("api/[controller]")] - [Authorize] - public class EnrollmentController : ControllerBase - { - private readonly IEnrollmentService _enrollmentService; - - public EnrollmentController(IEnrollmentService enrollmentService) - { - _enrollmentService = enrollmentService; - } - - [HttpGet("options")] - public async Task GetOptions() - { - if (!TryGetStudentId(out var studentId, out var error)) - { - return error; - } - - return Ok(await _enrollmentService.GetOptionsAsync(studentId)); - } - - [HttpPost] - public async Task Enroll([FromBody] EnrollSemesterRequestDto request) - { - if (!TryGetStudentId(out var studentId, out var error)) - { - return error; - } - - var result = await _enrollmentService.EnrollAsync(studentId, request); - return result.Ok ? Ok(result) : BadRequest(result); - } - - /// - /// Reads the caller from the validated token, so a student can only ever - /// enrol themselves. - /// - private bool TryGetStudentId(out int studentId, out IActionResult error) - { - studentId = 0; - error = Forbid(); - - var role = User.FindFirst(ClaimTypes.Role)?.Value ?? User.FindFirst("role")?.Value; - if (!string.Equals(role, nameof(Models.UserRole.Student), StringComparison.OrdinalIgnoreCase)) - { - error = StatusCode(403, new EnrollSemesterResultDto - { - Ok = false, - Message = "Only students can enrol in a semester." - }); - return false; - } - - var idClaim = User.FindFirst("id")?.Value; - if (!int.TryParse(idClaim, out studentId)) - { - error = Unauthorized(new EnrollSemesterResultDto - { - Ok = false, - Message = "Token has no usable user id." - }); - return false; - } - - return true; - } - } -} Index: iknow-api/Controllers/ProfController.cs =================================================================== --- iknow-api/Controllers/ProfController.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,93 +1,0 @@ -using System.Security.Claims; -using iknow_api.DTOs; -using iknow_api.Services; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace iknow_api.Controllers -{ - [ApiController] - [Route("api/[controller]")] - [Authorize] - public class ProfController : ControllerBase - { - private readonly IProfService _profService; - - public ProfController(IProfService profService) - { - _profService = profService; - } - - /// - /// The subjects this professor teaches, each with the students enrolled - /// in it and their grade so far. - /// - [HttpGet("students")] - public async Task GetStudents() - { - if (!TryGetProfessorId(out var professorId, out var error)) - { - return error; - } - - return Ok(await _profService.GetStudentsBySubjectAsync(professorId)); - } - - [HttpPost("grade/add")] - public Task AddGrade([FromBody] GradeRequestDto request) => - SetGrade(request, GradeAction.Add); - - [HttpPost("grade/edit")] - public Task EditGrade([FromBody] GradeRequestDto request) => - SetGrade(request, GradeAction.Edit); - - [HttpPost("grade/remove")] - public Task RemoveGrade([FromBody] GradeRequestDto request) => - SetGrade(request, GradeAction.Remove); - - private async Task SetGrade(GradeRequestDto request, GradeAction action) - { - if (!TryGetProfessorId(out var professorId, out var error)) - { - return error; - } - - var result = await _profService.SetGradeAsync(professorId, request, action); - return result.Ok ? Ok(result) : BadRequest(result); - } - - /// - /// Reads the caller from the validated token and requires the professor - /// role, so one professor can never act on another one's subjects. - /// - private bool TryGetProfessorId(out int professorId, out IActionResult error) - { - professorId = 0; - error = Forbid(); - - var role = User.FindFirst(ClaimTypes.Role)?.Value ?? User.FindFirst("role")?.Value; - if (!string.Equals(role, nameof(Models.UserRole.Professor), StringComparison.OrdinalIgnoreCase)) - { - error = StatusCode(403, new GradeResultDto - { - Ok = false, - Message = "This endpoint is for professors." - }); - return false; - } - - var idClaim = User.FindFirst("id")?.Value; - if (!int.TryParse(idClaim, out professorId)) - { - error = Unauthorized(new GradeResultDto - { - Ok = false, - Message = "Token has no usable user id." - }); - return false; - } - - return true; - } - } -} Index: iknow-api/Controllers/UserController.cs =================================================================== --- iknow-api/Controllers/UserController.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,348 +1,0 @@ -using iknow_api.DTOs; -using iknow_api.Models; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using iknow_api.Services; - -namespace iknow_api.Controllers -{ - [ApiController] - [Route("api/[controller]")] - public class UserController : Controller - { - IUserService _userService; - public UserController(IUserService userService) - { - _userService = userService; - } - - // "birthInfo": { - // "placeOfBirth": "Скопје", - // "municipalityOfBirth": "Скопје", - // "country": "Република Северна Македонија" - // }, - // "previousEducation": { - // "type": "Гимназиско образование", - // "profession": "", - // "average": "54,857", - // "language": "Македонски", - // "country": "", - // "previousUniversity": "Гимназиско образование", - // "previousFaculty": "", - // "previousStudyMode": "" - // }, - // "enrollmentInfo": { - // "enrollmentYear": "2023", - // "status": "Редовен", - // "cycle": "Прв циклус", - // "program": "Примена на информациски технологии", - // "quota": "Кофинансирање-Редовен (2023, 24600)", - // "secondaryEducationNumber": "", - // "previousEducationCredits": "" - // }, - // "contact": { - // "placeOfResidence": "Скопје", - // "municipalityOfResidence": "Кисела Вода - Скопје", - // "country": "Република Северна Македонија", - // "address": "Драчево", - // "temporaryAddress": "", - // "phone": "", - // "mobilePhone": "075295582", - // "passportNumber": "", - // "passportExpiryDate": "", - // "email": "stefansaveski19@gmail.com", - // "microsoftEmail": "stefan.saveski@students.finki.ukim.mk" - // } - //} - [Authorize] - [HttpGet("getUser")] - public async Task getUser() - { - //{ - // "personalInfo": { - // "index": "233149/2023", - // "embg": "/////////////", - // "lastName": "Савески", - // "middleName": "Дејан", - // "firstName": "Стефан", - // "maidenName": "", - // "dateOfBirth": "19.08.2004", - // "gender": "машки", - // "nationality": "Македонец", - // "citizenship": "Република Северна Македонија", - // "scholarship": "Користи", - // "currentPlan": "2023", - // "registryNumber": "", - // "notes": "Систематски преглед Студира 3 години", - // "studyGroup": "" - // }, - var authHeader = Request.Headers["Authorization"].ToString(); - if (authHeader.StartsWith("Bearer ")) - { - var token = authHeader.Substring("Bearer ".Length).Trim(); - // token = your JWT - var userData = await _userService.GetUserData(token); - if (userData == null) return Ok(new { info = "can't get info" }); - - // The study programme comes from the student's most recent - // enrolment. Within an academic year winter precedes summer, - // so order by year first and put winter ahead of summer. - var currentEnrolment = userData.Enrolments? - .Where(es => es.Semester != null) - .OrderByDescending(es => es.Semester!.Year) - .ThenByDescending(es => es.Semester!.Type == sType.summer) - .FirstOrDefault(); - - var personalInfo = new - { - index = userData.Index ?? "", - embg = userData.EMBG ?? "", - lastName = userData.Surname ?? "", - middleName = "", // Not an attribute of Users in the ER model - firstName = userData.Name ?? "", - maidenName = "", // Property doesn't exist in User model - dateOfBirth = userData.Bday?.ToString("dd.MM.yyyy") ?? "", - gender = "", // Not an attribute of Users in the ER model - nationality = "", // Not an attribute of Users in the ER model - citizenship = "", // Not an attribute of Users in the ER model - scholarship = "", - currentPlan = userData.EnrollmentYear?.ToString() ?? "", - registryNumber = "", - notes = "", - studyGroup = "" - }; - var birthInfo = new - { - placeOfBirth = userData.ContactInfo?.City ?? "", - municipalityOfBirth = userData.ContactInfo?.Municipality ?? "", - country = "" // Not an attribute of Users in the ER model - }; - var previousEducation = new - { - type = userData.HighSchool?.HighSchoolType.ToString() ?? "", - profession = "", - average = userData.HighSchool?.GPA.ToString() ?? "", - language = "", // Not an attribute of HighSchool in the ER model - country = "", - previousUniversity = userData.HighSchool?.HighSchoolType.ToString() ?? "", - previousFaculty = "", // Property doesn't exist in HighSchool model - previousStudyMode = "" // Property doesn't exist in HighSchool model - }; - var enrollmentInfo = new - { - enrollmentYear = userData.EnrollmentYear?.ToString() ?? "", - status = "", // Not an attribute of Users in the ER model - cycle = "Прв циклус", - program = currentEnrolment?.Major?.Name ?? "", - quota = userData.Quota?.ToString() ?? "", - secondaryEducationNumber = "", - previousEducationCredits = "" - }; - var contact = new - { - placeOfResidence = userData.ContactInfo?.City ?? "", - municipalityOfResidence = userData.ContactInfo?.Municipality ?? "", - country = "", // Not an attribute of Users in the ER model - address = userData.ContactInfo?.Address ?? "", - temporaryAddress = "", - phone = "", - mobilePhone = userData.ContactInfo?.PhoneNumber ?? "", - passportNumber = "", - passportExpiryDate = "", - email = userData.Email ?? "", - microsoftEmail = userData.ContactInfo?.MicrosoftEmail ?? "" - }; - return Ok(new { personalInfo = personalInfo, birthInfo = birthInfo, previousEducation = previousEducation, enrollmentInfo = enrollmentInfo, contact = contact }); - //return Ok(new { User = userData }); - } - return null; - - } - [Authorize] - [HttpGet("getSemesters")] - public async Task getSemesters() - { - var authHeader = Request.Headers["Authorization"].ToString(); - if (authHeader.StartsWith("Bearer ")) - { - var token = authHeader.Substring("Bearer ".Length).Trim(); - // token = your JWT - var userData = await _userService.GetUserSemesters(token); - var results = new List(); - - for (int i = 0; i < userData.Count; i++) - { - var newResult = new - { - id = userData[i].Id, - // sType declares summer first, so compare against the member - // rather than the ordinal - == 0 meant summer, not winter. - semester = (userData[i].Semester.Type == sType.winter ? "Зимски" : "Летен") + $"({userData[i].Semester.Year}/{userData[i].Semester.Year + 1})", - direction = userData[i].Major?.Name ?? "", - quota = userData[i].QuotaType.ToString(), - note = userData[i].Note ?? "", - studentCom = userData[i].StudentComment ?? "", - sum = "0,00", - paid = "0,00", - ukim = "", - createdOn = userData[i].CratedAt.ToString("dd.MM.yyyy"), - dateChanged = userData[i].LastChange?.ToString("dd.MM.yyyy") ?? "", - credits = "0,00", - type = "Ред.", - doc = "Не", - doc1 = "Не", - verified = "Не", - taxes = "0,00", - signatures = "0/5", - status = "валиден", - completed = userData[i].Verified.HasValue ? "Да" : "Не" - }; - results.Add(newResult); - } - if (userData == null) return Ok(new { info = "can't get info" }); - return Ok(new { semesters = results }); - } - return null; - } - - [Authorize] - [HttpGet("getSubjects")] - public async Task getSubjects() - { - var authHeader = Request.Headers["Authorization"].ToString(); - var token = authHeader.Substring("Bearer ".Length).Trim(); - // token = your JWT - var userData = await _userService.GetUserSemesters(token); - var results = new List(); - var random = new Random(); - for (int i = 0; i < userData.Count; i++) - { - var newResult = new - { - id = userData[i].Id, - name = (userData[i].Semester.Type == sType.winter ? "Зимски" : "Летен") + $"({userData[i].Semester.Year}/{userData[i].Semester.Year + 1})", - status = "валиден", - serviceNumber = 1000000 + random.Next(10000, 100000) - }; - results.Add(newResult); - } - - - var subjectsBySemester = new Dictionary>(); - - foreach (var enrollment in userData) - { - // Create semester key like "winter_2025_2026" or "summer_2025_2026" - var semesterType = enrollment.Semester.Type == sType.winter ? "winter" : "summer"; - var semesterKey = $"{semesterType}_{enrollment.Semester.Year}_{enrollment.Semester.Year + 1}"; - - // Initialize list if this semester key doesn't exist - if (!subjectsBySemester.ContainsKey(semesterKey)) - { - subjectsBySemester[semesterKey] = new List(); - } - - // Add subjects from this semester enrollment - if (enrollment.SemesterSubjects != null) - { - foreach (var semesterSubject in enrollment.SemesterSubjects) - { - var subject = semesterSubject.Subject; - if (subject != null) - { - var subjectData = new - { - id = subject.Id, - code = subject.Code ?? "", - hours = "2+4", // You may need to add this to your Subject model - kojPat = 1, // You may need to add this field - name = subject.Name ?? "", - semester = 5, // You may need to calculate or add this field - status = "Зад.", // Determine based on PassedSubject or other logic - signature = semesterSubject.Signature ? "Да" : "Не", - group = "", // You may need to add this field - professor = semesterSubject.Professor?.Name + " " + semesterSubject.Professor?.Surname ?? "", - }; - subjectsBySemester[semesterKey].Add(subjectData); - } - } - } - - } - var currentSemester = userData.FirstOrDefault(); // Get the most recent/current semester - var semesterTypeGlobal = currentSemester.Semester.Type == sType.winter ? "winter" : "summer"; - var semesterData = new - { - id = $"{semesterTypeGlobal}_{currentSemester.Semester.Year}_{currentSemester.Semester.Year + 1}", - name = (currentSemester.Semester.Type == sType.winter ? "Зимски" : "Летен") + $" ({currentSemester.Semester.Year}/{currentSemester.Semester.Year + 1})", - status = "валиден", - serviceNumber = (1000000 + random.Next(10000, 100000)).ToString(), - ticketNumber = random.Next(100000, 1000000).ToString(), - debt = "0,00", - financialInfo = new - { - sum = 1, - paid = "0,00", - due = "0,00", - materialCosts = "Осигурување, Административна такса, Тетратки (испити), зимски семестар: 1000,00", - credits = "30,00", - totalCredits = "30,00", - MKSA = "750,00", - electronicRegistration = "100,00", - eUKIM = "350,00", - bankProvision = "25,00", - total = "2226,00" - } - }; - if (userData == null) return Ok(new { info = "can't get info" }); - //return Ok(new { semester = userData }); - return Ok(new { semesters = results, currentSemestar = semesterData, subjectsBySemester = subjectsBySemester }); - } - - [Authorize] - [HttpGet("getPassedSubjects")] - public async Task getPassedSubjects() - { - var authHeader = Request.Headers["Authorization"].ToString(); - if (!authHeader.StartsWith("Bearer ")) - return Unauthorized(); - - var token = authHeader.Substring("Bearer ".Length).Trim(); - var passedSubjects = await _userService.GetUserPassedSubjects(token); - - if (passedSubjects == null || !passedSubjects.Any()) - return Ok(new { info = "No passed subjects found", passedSubjects = new List() }); - - var results = new List(); - - foreach (var passed in passedSubjects) - { - if (passed.SemesterSubject?.Subject != null) - { - var result = new - { - id = passed.Id, - subjectId = passed.SemesterSubject.Subject.Id, - code = passed.SemesterSubject.Subject.Code ?? "", - subject = passed.SemesterSubject.Subject.Name ?? "", - credits = passed.SemesterSubject.Subject.AwardedCredits ?? 0, - grade = (int)passed.Grade, - gradeText = passed.Grade.ToString(), - date = passed.DatePassed.ToString("dd.MM.yyyy"), - semester = passed.SemesterSubject.EnrolledSemester?.Semester != null - ? (passed.SemesterSubject.EnrolledSemester.Semester.Type == sType.winter ? "Зимски" : "Летен") + - $" ({passed.SemesterSubject.EnrolledSemester.Semester.Year}/{passed.SemesterSubject.EnrolledSemester.Semester.Year + 1})" - : "", - professor = passed.SemesterSubject.Professor != null - ? $"{passed.SemesterSubject.Professor.Name} {passed.SemesterSubject.Professor.Surname}".Trim() - : "" - }; - results.Add(result); - } - } - - return Ok(new { passedSubjects = results }); - } - - } -} Index: iknow-api/Controllers/WeatherForecastController.cs =================================================================== --- iknow-api/Controllers/WeatherForecastController.cs (revision c11d3a3e5ecfc9bc60609c1fae1e70e64b8e1e0a) +++ iknow-api/Controllers/WeatherForecastController.cs (revision c11d3a3e5ecfc9bc60609c1fae1e70e64b8e1e0a) @@ -0,0 +1,33 @@ +using Microsoft.AspNetCore.Mvc; + +namespace iknow_api.Controllers +{ + [ApiController] + [Route("[controller]")] + public class WeatherForecastController : ControllerBase + { + private static readonly string[] Summaries = new[] + { + "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" + }; + + private readonly ILogger _logger; + + public WeatherForecastController(ILogger logger) + { + _logger = logger; + } + + [HttpGet(Name = "GetWeatherForecast")] + public IEnumerable Get() + { + return Enumerable.Range(1, 5).Select(index => new WeatherForecast + { + Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)), + TemperatureC = Random.Shared.Next(-20, 55), + Summary = Summaries[Random.Shared.Next(Summaries.Length)] + }) + .ToArray(); + } + } +} Index: iknow-api/DTOs/AdminDTO.cs =================================================================== --- iknow-api/DTOs/AdminDTO.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,121 +1,0 @@ -namespace iknow_api.DTOs -{ - // ---------- UC012 subjects ---------- - - public class AdminSubjectDto - { - public int Id { get; set; } - public string? Name { get; set; } - public string? Code { get; set; } - public int AwardedCredits { get; set; } - public int? DependencyCredit { get; set; } - public List Majors { get; set; } = new(); - public List Prerequisites { get; set; } = new(); - /// How many enrolments already contain this subject; it cannot be deleted while this is above zero. - public int EnrolledCount { get; set; } - } - - public class SubjectMajorDto - { - public int MajorId { get; set; } - public string? MajorName { get; set; } - public int MandatorySemester { get; set; } - } - - public class SubjectRefDto - { - public int Id { get; set; } - public string? Name { get; set; } - public string? Code { get; set; } - } - - public class SubjectWriteDto - { - public string? Name { get; set; } - public string? Code { get; set; } - public int AwardedCredits { get; set; } - public int? DependencyCredit { get; set; } - } - - public class MajorLinkDto - { - public int MajorId { get; set; } - public int MandatorySemester { get; set; } - } - - public class PrerequisiteDto - { - public int DependencyId { get; set; } - } - - // ---------- UC013 semesters ---------- - - public class AdminSemesterDto - { - public int Id { get; set; } - public int Year { get; set; } - public string? Type { get; set; } - public string? Name { get; set; } - public int EnrolmentCount { get; set; } - /// Subjects with no professor teaching them in this semester. - public List UncoveredSubjects { get; set; } = new(); - } - - public class SemesterWriteDto - { - public int Year { get; set; } - /// "winter" or "summer". - public string? Type { get; set; } - } - - // ---------- UC014 schedule ---------- - - public class ScheduleDto - { - public int SemesterId { get; set; } - public string? SemesterName { get; set; } - public List Assignments { get; set; } = new(); - public List Load { get; set; } = new(); - public List UncoveredSubjects { get; set; } = new(); - public List AllSubjects { get; set; } = new(); - public List Professors { get; set; } = new(); - } - - public class ScheduleRowDto - { - public int SubjectId { get; set; } - public string? SubjectName { get; set; } - public string? SubjectCode { get; set; } - public int ProfessorId { get; set; } - public string? ProfessorName { get; set; } - } - - public class ProfessorRefDto - { - public int Id { get; set; } - public string? Name { get; set; } - } - - public class ProfessorLoadDto - { - public int ProfessorId { get; set; } - public string? ProfessorName { get; set; } - public int Subjects { get; set; } - } - - public class ScheduleWriteDto - { - public int ProfessorId { get; set; } - public int SemesterId { get; set; } - public int SubjectId { get; set; } - } - - // ---------- shared ---------- - - public class AdminResultDto - { - public bool Ok { get; set; } - public string? Message { get; set; } - public int? Id { get; set; } - } -} Index: iknow-api/DTOs/EnrollmentDTO.cs =================================================================== --- iknow-api/DTOs/EnrollmentDTO.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,57 +1,0 @@ -namespace iknow_api.DTOs -{ - /// Everything the enrolment form needs to render. - public class EnrollmentOptionsDto - { - /// How many subjects an enrolment must contain. - public int RequiredSubjects { get; set; } - - /// Semesters this student has not enrolled in yet. - public List Semesters { get; set; } = new(); - - public List Majors { get; set; } = new(); - - /// The major from the most recent enrolment, if there is one. - public int? DefaultMajorId { get; set; } - } - - public class SemesterOptionDto - { - public int Id { get; set; } - public string? Name { get; set; } - public int Year { get; set; } - public string? Type { get; set; } - } - - public class MajorOptionDto - { - public int Id { get; set; } - public string? Name { get; set; } - public List Subjects { get; set; } = new(); - } - - public class SubjectOptionDto - { - public int Id { get; set; } - public string? Name { get; set; } - public string? Code { get; set; } - public int Credits { get; set; } - public int MandatorySemester { get; set; } - /// True when the student already passed this subject. - public bool AlreadyPassed { get; set; } - } - - public class EnrollSemesterRequestDto - { - public int SemesterId { get; set; } - public int MajorId { get; set; } - public List SubjectIds { get; set; } = new(); - } - - public class EnrollSemesterResultDto - { - public bool Ok { get; set; } - public string? Message { get; set; } - public int? EnrolledSemesterId { get; set; } - } -} Index: iknow-api/DTOs/ProfDTO.cs =================================================================== --- iknow-api/DTOs/ProfDTO.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,36 +1,0 @@ -namespace iknow_api.DTOs -{ - /// One subject a professor teaches, with the students enrolled in it. - public class SubjectStudentsDto - { - public int Id { get; set; } - public string? Name { get; set; } - public string? Code { get; set; } - public List Users { get; set; } = new(); - } - - public class EnrolledStudentDto - { - /// users.id - what the grading endpoints expect as StudentId. - public int Id { get; set; } - public string? Name { get; set; } - /// users.index - the number a professor actually recognises. - public string? Index { get; set; } - /// 0 when the subject has not been graded yet. - public int Grade { get; set; } - public string? Semester { get; set; } - } - - public class GradeRequestDto - { - public int StudentId { get; set; } - public int SubjectId { get; set; } - public int Grade { get; set; } - } - - public class GradeResultDto - { - public bool Ok { get; set; } - public string? Message { get; set; } - } -} Index: iknow-api/DTOs/RefreshTokenDTO.cs =================================================================== --- iknow-api/DTOs/RefreshTokenDTO.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,14 +1,0 @@ -namespace iknow_api.DTOs -{ - public class VerifyRefreshTokenDto - { - public string token { get; set; } = string.Empty; - } - - public class AuthResultDto - { - public string AccessToken { get; set; } = string.Empty; - public string? RefreshToken { get; set; } - public string Role { get; set; } = string.Empty; - } -} Index: iknow-api/DTOs/UserDTO.cs =================================================================== --- iknow-api/DTOs/UserDTO.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,74 +1,0 @@ -using System.Text.Json.Serialization; - -namespace iknow_api.DTOs -{ - // Login DTO - public class LoginDto - { - public string Email { get; set; } = string.Empty; - public string Password { get; set; } = string.Empty; - public bool GenerateRefreshToken { get; set; } - } - public class GetUserDataDto - { - public string? JWT { get; set; } - } - - // Registration DTO - public class RegisterDto - { - public string Name { get; set; } = string.Empty; - public string? MiddleName { get; set; } - public string Surname { get; set; } = string.Empty; - public string EMBG { get; set; } = string.Empty; - public string? Index { get; set; } - public string Email { get; set; } = string.Empty; - public string Password { get; set; } = string.Empty; - public DateTime Bday { get; set; } - public UserRole Role { get; set; } - public float gpa { get; set; } - public HighSchoolType tip { get; set; } - public string city { get; set; } = string.Empty; - public string address { get; set; } = string.Empty; - public string municipality { get; set; } = string.Empty; - public string phoneNumber { get; set; } = string.Empty; - public string microsoftEmail { get; set; } = string.Empty; - public int enrollmentYear { get; set; } - public Quota quotaType { get; set; } - public int majorType { get; set; } - public string? gender { get; set; } - public string? nationality { get; set; } - public string? citizenship { get; set; } - public string? studyType { get; set; } - public string? studyStatus { get; set; } - } - - // User response DTO (for returning user data without password) - public class UserResponseDto - { - public int Id { get; set; } - public string? Name { get; set; } - public string? Surname { get; set; } - public string? Index { get; set; } - public string? Email { get; set; } - public DateTime Bday { get; set; } - public DateTime CreatedAt { get; set; } - public UserRole Role { get; set; } - } - - // User role enum - public enum UserRole - { - Admin, - Professor, - Student - } - public enum HighSchoolType - { - strucen, gimnazija - } - public enum Quota - { - drzavna, privatna, stipendija - } -} Index: iknow-api/Data/AppDbContext.cs =================================================================== --- iknow-api/Data/AppDbContext.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,378 +1,0 @@ -using Microsoft.EntityFrameworkCore; -using iknow_api.Models; - -namespace iknow_api.Data -{ - /// - /// The schema is owned by sql/ddl.sql, not by EF migrations. Every entity - /// below is mapped explicitly onto the table and column names in that - /// script; nothing here may rely on EF naming conventions. - /// - public class AppDbContext : DbContext - { - /// - /// The schema created by sql/schema_creation.sql. Every table and enum - /// type is qualified with it, so nothing depends on search_path. - /// - public const string ProjectSchema = "project"; - - public AppDbContext(DbContextOptions options) - : base(options) { } - - public DbSet User { get; set; } - public DbSet ContactInfo { get; set; } - public DbSet HighSchool { get; set; } - public DbSet RefreshToken { get; set; } - public DbSet Subjects { get; set; } - public DbSet DependencySubjects { get; set; } - public DbSet Majors { get; set; } - public DbSet PassedSubjects { get; set; } - public DbSet EnrolledSemesters { get; set; } - public DbSet ActiveSemesters { get; set; } - public DbSet SemesterSubjects { get; set; } - public DbSet MajorSubjects { get; set; } - public DbSet UserDocuments { get; set; } - public DbSet Documents { get; set; } - public DbSet Payments { get; set; } - public DbSet ProfessorSubjects { get; set; } - - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - base.OnModelCreating(modelBuilder); - - // The enum types themselves are declared in ddl.sql; this tells EF - // they exist so it does not try to treat the columns as text. - modelBuilder.HasPostgresEnum(ProjectSchema, "user_role"); - modelBuilder.HasPostgresEnum(ProjectSchema, "hs_type"); - modelBuilder.HasPostgresEnum(ProjectSchema, "quota_type"); - modelBuilder.HasPostgresEnum(ProjectSchema, "semester_type"); - modelBuilder.HasPostgresEnum(ProjectSchema, "grade_type"); - - // ------------------------- - // users - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("users", ProjectSchema); - e.HasKey(u => u.Id); - e.Property(u => u.Id).HasColumnName("id"); - e.Property(u => u.Name).HasColumnName("name"); - e.Property(u => u.EMBG).HasColumnName("embg"); - e.Property(u => u.Surname).HasColumnName("surname"); - e.Property(u => u.Index).HasColumnName("index"); - e.Property(u => u.Bday).HasColumnName("bday").HasColumnType("timestamp without time zone"); - e.Property(u => u.Email).HasColumnName("email"); - e.Property(u => u.PasswordHash).HasColumnName("password"); - e.Property(u => u.Role).HasColumnName("role"); - e.Property(u => u.Quota).HasColumnName("quota"); - e.Property(u => u.EnrollmentYear).HasColumnName("enrollment_year"); - e.Property(u => u.CreatedAt).HasColumnName("created_at").HasColumnType("timestamp without time zone"); - e.HasIndex(u => u.Email).IsUnique(); - }); - - // ------------------------- - // high_school - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("high_school", ProjectSchema); - e.HasKey(h => h.Id); - e.Property(h => h.Id).HasColumnName("id"); - e.Property(h => h.UserId).HasColumnName("user_id"); - e.Property(h => h.GPA).HasColumnName("gpa"); - e.Property(h => h.HighSchoolType).HasColumnName("type"); - e.HasOne(h => h.User) - .WithOne(u => u.HighSchool) - .HasForeignKey(h => h.UserId) - .OnDelete(DeleteBehavior.Restrict); - }); - - // ------------------------- - // contact - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("contact", ProjectSchema); - e.HasKey(c => c.Id); - e.Property(c => c.Id).HasColumnName("id"); - e.Property(c => c.UserId).HasColumnName("user_id"); - e.Property(c => c.City).HasColumnName("city"); - e.Property(c => c.Municipality).HasColumnName("municipality"); - e.Property(c => c.Address).HasColumnName("address"); - e.Property(c => c.PhoneNumber).HasColumnName("number"); - e.Property(c => c.MicrosoftEmail).HasColumnName("microsoft_email"); - e.HasOne(c => c.User) - .WithOne(u => u.ContactInfo) - .HasForeignKey(c => c.UserId) - .OnDelete(DeleteBehavior.Restrict); - }); - - // ------------------------- - // major - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("major", ProjectSchema); - e.HasKey(m => m.Id); - e.Property(m => m.Id).HasColumnName("id"); - e.Property(m => m.Name).HasColumnName("name"); - }); - - // ------------------------- - // active_semesters - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("active_semesters", ProjectSchema); - e.HasKey(a => a.Id); - e.Property(a => a.Id).HasColumnName("id"); - e.Property(a => a.Year).HasColumnName("year"); - e.Property(a => a.Type).HasColumnName("type"); - }); - - // ------------------------- - // subjects - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("subjects", ProjectSchema); - e.HasKey(s => s.Id); - e.Property(s => s.Id).HasColumnName("id"); - e.Property(s => s.Name).HasColumnName("name"); - e.Property(s => s.Code).HasColumnName("code"); - e.Property(s => s.AwardedCredits).HasColumnName("awarded_credits"); - e.Property(s => s.DependencyCredit).HasColumnName("dependency_credit"); - }); - - // ------------------------- - // enrolled_semesters - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("enrolled_semesters", ProjectSchema); - e.HasKey(es => es.Id); - e.Property(es => es.Id).HasColumnName("id"); - e.Property(es => es.UserId).HasColumnName("user_id"); - e.Property(es => es.QuotaType).HasColumnName("quota"); - e.Property(es => es.MajorId).HasColumnName("major_id"); - e.Property(es => es.Note).HasColumnName("note"); - e.Property(es => es.StudentComment).HasColumnName("student_comment"); - e.Property(es => es.CratedAt).HasColumnName("created_at").HasColumnType("timestamp without time zone"); - e.Property(es => es.LastChange).HasColumnName("last_change").HasColumnType("timestamp without time zone"); - e.Property(es => es.Verified).HasColumnName("completed").HasColumnType("timestamp without time zone"); - e.Property(es => es.SemesterId).HasColumnName("semester_id"); - - e.HasOne(es => es.User) - .WithMany(u => u.Enrolments) - .HasForeignKey(es => es.UserId) - .OnDelete(DeleteBehavior.Restrict); - - // Note: this deliberately keys off SemesterId. An earlier version - // pointed the foreign key at es.Id, which silently tied every - // enrolment to the semester that happened to share its id. - e.HasOne(es => es.Semester) - .WithMany(a => a.EnrolledSemesters) - .HasForeignKey(es => es.SemesterId) - .OnDelete(DeleteBehavior.Restrict); - - e.HasOne(es => es.Major) - .WithMany() - .HasForeignKey(es => es.MajorId) - .OnDelete(DeleteBehavior.Restrict); - }); - - // ------------------------- - // semesters_subjects - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("semesters_subjects", ProjectSchema); - e.HasKey(ss => ss.Id); - e.Property(ss => ss.Id).HasColumnName("id"); - e.Property(ss => ss.EnrolledSemesterId).HasColumnName("enrolled_semesters_id"); - e.Property(ss => ss.SubjectId).HasColumnName("subjects_id"); - e.Property(ss => ss.ProfessorId).HasColumnName("professor_id"); - e.Property(ss => ss.Signature).HasColumnName("signature"); - - e.HasOne(ss => ss.Professor) - .WithMany(u => u.TeachingSubjects) - .HasForeignKey(ss => ss.ProfessorId) - .OnDelete(DeleteBehavior.Restrict); - - e.HasOne(ss => ss.Subject) - .WithMany(s => s.SemesterSubjects) - .HasForeignKey(ss => ss.SubjectId) - .OnDelete(DeleteBehavior.Restrict); - - e.HasOne(ss => ss.EnrolledSemester) - .WithMany(es => es.SemesterSubjects) - .HasForeignKey(ss => ss.EnrolledSemesterId) - .OnDelete(DeleteBehavior.Restrict); - }); - - // ------------------------- - // passed_subjects - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("passed_subjects", ProjectSchema); - e.HasKey(ps => ps.Id); - e.Property(ps => ps.Id).HasColumnName("id"); - e.Property(ps => ps.SemesterSubjectId).HasColumnName("enrolled_id"); - e.Property(ps => ps.Grade).HasColumnName("grade"); - e.Property(ps => ps.DatePassed).HasColumnName("date_passed").HasColumnType("timestamp without time zone"); - - e.HasOne(ps => ps.SemesterSubject) - .WithOne(ss => ss.PassedSubject) - .HasForeignKey(ps => ps.SemesterSubjectId) - .OnDelete(DeleteBehavior.Cascade); - }); - - // ------------------------- - // documents - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("documents", ProjectSchema); - e.HasKey(d => d.Id); - e.Property(d => d.Id).HasColumnName("id"); - e.Property(d => d.Name).HasColumnName("type"); - e.Property(d => d.Body).HasColumnName("body"); - e.Property(d => d.Cost).HasColumnName("cost"); - }); - - // ------------------------- - // user_documents - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("user_documents", ProjectSchema); - e.HasKey(ud => new { ud.UserId, ud.DocumentId }); - e.Property(ud => ud.UserId).HasColumnName("user_id"); - e.Property(ud => ud.DocumentId).HasColumnName("document_id"); - - e.HasOne(ud => ud.User) - .WithMany(u => u.Documents) - .HasForeignKey(ud => ud.UserId) - .OnDelete(DeleteBehavior.Cascade); - - e.HasOne(ud => ud.Documents) - .WithMany(d => d.User) - .HasForeignKey(ud => ud.DocumentId) - .OnDelete(DeleteBehavior.Cascade); - }); - - // ------------------------- - // token - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("token", ProjectSchema); - e.HasKey(t => t.Id); - e.Property(t => t.Id).HasColumnName("id"); - e.Property(t => t.UserId).HasColumnName("user_id"); - e.Property(t => t.Token).HasColumnName("token"); - e.Property(t => t.ExpiresAt).HasColumnName("expires_at").HasColumnType("timestamp without time zone"); - e.Property(t => t.IsValid).HasColumnName("is_valid"); - - e.HasOne(t => t.User) - .WithMany() - .HasForeignKey(t => t.UserId) - .OnDelete(DeleteBehavior.Cascade); - }); - - // ------------------------- - // payment - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("payment", ProjectSchema); - e.HasKey(p => p.Id); - e.Property(p => p.Id).HasColumnName("id"); - e.Property(p => p.UserId).HasColumnName("user_id"); - e.Property(p => p.EnrollmentInfoId).HasColumnName("enrollment_id"); - e.Property(p => p.Amount).HasColumnName("amount"); - - e.HasOne(p => p.User) - .WithMany(u => u.Payments) - .HasForeignKey(p => p.UserId) - .OnDelete(DeleteBehavior.Cascade); - - e.HasOne(p => p.EnrolledSemesters) - .WithMany(es => es.Users) - .HasForeignKey(p => p.EnrollmentInfoId) - .OnDelete(DeleteBehavior.Cascade); - }); - - // ------------------------- - // major_subjects - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("major_subjects", ProjectSchema); - e.HasKey(ms => new { ms.MajorId, ms.SubjectId }); - e.Property(ms => ms.MajorId).HasColumnName("major_id"); - e.Property(ms => ms.SubjectId).HasColumnName("subject_id"); - e.Property(ms => ms.MandatorySemester).HasColumnName("mandatory_semester"); - - e.HasOne(ms => ms.Majors) - .WithMany(m => m.Subjects) - .HasForeignKey(ms => ms.MajorId) - .OnDelete(DeleteBehavior.Cascade); - - e.HasOne(ms => ms.Subjects) - .WithMany(s => s.Majors) - .HasForeignKey(ms => ms.SubjectId) - .OnDelete(DeleteBehavior.Cascade); - }); - - // ------------------------- - // dependency_subject - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("dependency_subject", ProjectSchema); - e.HasKey(ds => new { ds.SubjectId, ds.DependencyId }); - e.Property(ds => ds.SubjectId).HasColumnName("subject_id"); - e.Property(ds => ds.DependencyId).HasColumnName("dependency_id"); - - e.HasOne(ds => ds.Subject) - .WithMany(s => s.Dependencies) - .HasForeignKey(ds => ds.SubjectId) - .OnDelete(DeleteBehavior.Restrict); - - e.HasOne(ds => ds.Dependency) - .WithMany(s => s.Dependents) - .HasForeignKey(ds => ds.DependencyId) - .OnDelete(DeleteBehavior.Restrict); - }); - - // ------------------------- - // professour_subjects (spelling matches the table in ddl.sql) - // ------------------------- - modelBuilder.Entity(e => - { - e.ToTable("professour_subjects", ProjectSchema); - e.HasKey(ps => new { ps.ProfessorId, ps.SemesterId, ps.SubjectId }); - e.Property(ps => ps.ProfessorId).HasColumnName("prof_id"); - e.Property(ps => ps.SemesterId).HasColumnName("active_semester_id"); - e.Property(ps => ps.SubjectId).HasColumnName("subject_id"); - - e.HasOne(ps => ps.Professor) - .WithMany() - .HasForeignKey(ps => ps.ProfessorId) - .OnDelete(DeleteBehavior.Cascade); - - e.HasOne(ps => ps.Semester) - .WithMany() - .HasForeignKey(ps => ps.SemesterId) - .OnDelete(DeleteBehavior.Cascade); - - e.HasOne(ps => ps.Subject) - .WithMany() - .HasForeignKey(ps => ps.SubjectId) - .OnDelete(DeleteBehavior.Cascade); - }); - } - } -} Index: iknow-api/Data/PgEnumLabels.cs =================================================================== --- iknow-api/Data/PgEnumLabels.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,49 +1,0 @@ -using iknow_api.Models; -using Npgsql; - -namespace iknow_api.Data -{ - /// - /// Maps CLR enum member names onto the labels declared in sql/ddl.sql. - /// Most labels are just the lowercased member name; the ones that are not - /// (UserRole.Professor -> 'prof', Grade.Ten -> '10') are listed explicitly. - /// - /// The instances are static on purpose. EF Core caches its internal service - /// provider against the DbContext options, and a fresh translator instance - /// on every resolution makes each set of options look different - EF then - /// builds a new provider per resolution and throws - /// ManyServiceProvidersCreatedWarning once it has built twenty. - /// - public sealed class PgEnumLabels : INpgsqlNameTranslator - { - public static readonly PgEnumLabels UserRole = new( - new Dictionary - { - [nameof(Models.UserRole.Admin)] = "admin", - [nameof(Models.UserRole.Professor)] = "prof", - [nameof(Models.UserRole.Student)] = "student", - }); - - public static readonly PgEnumLabels Grade = new( - new Dictionary - { - [nameof(Models.Grade.Six)] = "6", - [nameof(Models.Grade.Seven)] = "7", - [nameof(Models.Grade.Eight)] = "8", - [nameof(Models.Grade.Nine)] = "9", - [nameof(Models.Grade.Ten)] = "10", - }); - - /// Lowercases the member name, which is all the other enums need. - public static readonly PgEnumLabels Lowercase = new(new Dictionary()); - - private readonly IReadOnlyDictionary _labels; - - private PgEnumLabels(IReadOnlyDictionary labels) => _labels = labels; - - public string TranslateTypeName(string clrName) => clrName; - - public string TranslateMemberName(string clrName) => - _labels.TryGetValue(clrName, out var label) ? label : clrName.ToLowerInvariant(); - } -} Index: iknow-api/Models/ActiveSemester.cs =================================================================== --- iknow-api/Models/ActiveSemester.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,18 +1,0 @@ - - - - -namespace iknow_api.Models -{ - public enum sType - { - summer,winter - } - public class ActiveSemesters - { - public int Id { get; set; } - public int Year { get; set; } - public sType Type { get; set; } - public ICollection? EnrolledSemesters { get; set; } - } -} Index: iknow-api/Models/ContactInfo.cs =================================================================== --- iknow-api/Models/ContactInfo.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,17 +1,0 @@ -using System.ComponentModel.DataAnnotations.Schema; - -namespace iknow_api.Models -{ - public class ContactInfo - { - public int Id { get; set; } - public string? City { get; set; } - public string? Address { get; set; } - public string? Municipality { get; set; } - public string? PhoneNumber { get; set; } - public string? MicrosoftEmail { get; set; } - - public int UserId { get; set; } - public User? User { get; set; } - } -} Index: iknow-api/Models/DependencySubject.cs =================================================================== --- iknow-api/Models/DependencySubject.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,10 +1,0 @@ -namespace iknow_api.Models -{ - public class DependencySubject - { - public int SubjectId { get; set; } - public int DependencyId { get; set; } - public Subject? Subject { get; set; } - public Subject? Dependency { get; set; } - } -} Index: iknow-api/Models/Documents.cs =================================================================== --- iknow-api/Models/Documents.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,11 +1,0 @@ -namespace iknow_api.Models -{ - public class Documents - { - public int Id { get; set; } - public string? Name { get; set; } - public string? Body { get; set; } - public int Cost { get; set; } - public ICollection? User { get; set; } - } -} Index: iknow-api/Models/EnrolledSemesters.cs =================================================================== --- iknow-api/Models/EnrolledSemesters.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,24 +1,0 @@ -using System.ComponentModel.DataAnnotations.Schema; - -namespace iknow_api.Models -{ - public class EnrolledSemesters - { - //Add type of semester winter/summer - public int Id { get; set; } - public int UserId { get; set; } - public User? User { get; set; } - public Quota QuotaType { get; set; } - public int MajorId { get; set; } - public string? StudentComment { get; set; } - public string? Note { get; set; } - public DateTime CratedAt { get; set; } - public DateTime? LastChange { get; set; } - public DateTime? Verified { get; set; } - public int SemesterId { get; set; } - public ActiveSemesters? Semester { get; set; } - public Major? Major { get; set; } - public ICollection? Users { get; set; } - public ICollection? SemesterSubjects { get; set; } - } -} Index: iknow-api/Models/HighSchool.cs =================================================================== --- iknow-api/Models/HighSchool.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,16 +1,0 @@ -namespace iknow_api.Models -{ - public enum HighSchoolType - { - Strucen, Gimnazija - } - - public class HighSchool - { - public int Id { get; set; } - public float GPA { get; set; } - public HighSchoolType HighSchoolType { get; set; } - public int UserId { get; set; } - public User? User { get; set; } - } -} Index: iknow-api/Models/Major.cs =================================================================== --- iknow-api/Models/Major.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,12 +1,0 @@ -using System.ComponentModel.DataAnnotations.Schema; - -namespace iknow_api.Models -{ - public class Major - { - public int Id { get; set; } - - public string? Name { get; set; } - public ICollection? Subjects { get; set; } - } -} Index: iknow-api/Models/MajorSubjects.cs =================================================================== --- iknow-api/Models/MajorSubjects.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,11 +1,0 @@ -namespace iknow_api.Models -{ - public class MajorSubjects - { - public int MajorId { get; set; } - public int SubjectId { get; set; } - public int MandatorySemester { get; set; } - public Major? Majors { get; set; } - public Subject? Subjects { get; set; } - } -} Index: iknow-api/Models/PassedSubject.cs =================================================================== --- iknow-api/Models/PassedSubject.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,20 +1,0 @@ -namespace iknow_api.Models -{ - public enum Grade - { - Six = 6, - Seven = 7, - Eight = 8, - Nine = 9, - Ten = 10 - } - - public class PassedSubject - { - public int Id { get; set; } - public int SemesterSubjectId { get; set; } - public SemesterSubject? SemesterSubject { get; set; } - public Grade Grade { get; set; } - public DateTime DatePassed { get; set; } - } -} Index: iknow-api/Models/Payment.cs =================================================================== --- iknow-api/Models/Payment.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,16 +1,0 @@ -using System.ComponentModel.DataAnnotations.Schema; - -namespace iknow_api.Models -{ - public class Payment - { - public int Id { get; set; } - - public int UserId { get; set; } - public User? User { get; set; } - public int EnrollmentInfoId { get; set; } - public int Amount { get; set; } - public EnrolledSemesters? EnrolledSemesters { get; set; } - - } -} Index: iknow-api/Models/ProfessorSubjects.cs =================================================================== --- iknow-api/Models/ProfessorSubjects.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,14 +1,0 @@ - -namespace iknow_api.Models -{ - public class ProfessorSubjects - { - public int ProfessorId { get; set; } - public User? Professor { get; set; } - public int SemesterId { get; set; } - public ActiveSemesters? Semester { get; set; } - public int SubjectId { get; set; } - public Subject? Subject { get; set; } - } -} - Index: iknow-api/Models/Quota.cs =================================================================== --- iknow-api/Models/Quota.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,7 +1,0 @@ -namespace iknow_api.Models -{ - public enum Quota - { - drzavna, privatna, stipendija - } -} Index: iknow-api/Models/RefreshToken.cs =================================================================== --- iknow-api/Models/RefreshToken.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,14 +1,0 @@ -using iknow_api.Models; - -namespace iknow_api.Models -{ - public class RefreshToken - { - public int Id { get; set; } - public int UserId { get; set; } - public User? User { get; set; } - public string? Token { get; set; } - public DateTime ExpiresAt { get; set; } - public bool IsValid { get; set; } - } -} Index: iknow-api/Models/SemesterSubjects.cs =================================================================== --- iknow-api/Models/SemesterSubjects.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,19 +1,0 @@ -namespace iknow_api.Models -{ - // The student is reached through EnrolledSemester.UserId; the ER model - // links SemestersSubjects to Users only through the professor. - public class SemesterSubject - { - public int Id { get; set; } - - public int EnrolledSemesterId { get; set; } - public int SubjectId { get; set; } - public int ProfessorId { get; set; } - public bool Signature { get; set; } - - public EnrolledSemesters? EnrolledSemester { get; set; } - public Subject? Subject { get; set; } - public User? Professor { get; set; } - public PassedSubject? PassedSubject { get; set; } - } -} Index: iknow-api/Models/Subjects.cs =================================================================== --- iknow-api/Models/Subjects.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,16 +1,0 @@ -namespace iknow_api.Models -{ - public class Subject - { - public int Id { get; set; } - public string? Name { get; set; } - public string? Code { get; set; } - public int? AwardedCredits { get; set; } - public int? DependencyCredit { get; set; } - public ICollection? Dependencies { get; set; } - public ICollection? Dependents { get; set; } - public ICollection? Majors { get; set; } - public ICollection? SemesterSubjects { get; set; } - - } -} Index: iknow-api/Models/User.cs =================================================================== --- iknow-api/Models/User.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,39 +1,0 @@ -namespace iknow_api.Models -{ - public enum UserRole - { - Admin, - Professor, - Student - } - - // Attributes follow the Users entity in the ER model exactly. - public class User - { - public int Id { get; set; } - public string? Name { get; set; } - public string? EMBG { get; set; } - public string? Surname { get; set; } - public string? Index { get; set; } - public string? Email { get; set; } - public string? PasswordHash { get; set; } - public DateTime? Bday { get; set; } - public DateTime CreatedAt { get; set; } - public UserRole Role { get; set; } - public Quota? Quota { get; set; } - public int? EnrollmentYear { get; set; } - - public HighSchool? HighSchool { get; set; } - public ContactInfo? ContactInfo { get; set; } - public ICollection? Documents { get; set; } - - // Named for the relationship it carries: Users 1 --pays-- N Payment. - public ICollection? Payments { get; set; } - - // Users 1 --submits-- N EnrolledSemesters - public ICollection? Enrolments { get; set; } - - // Users 1 --teaches-- N SemestersSubjects - public ICollection? TeachingSubjects { get; set; } - } -} Index: iknow-api/Models/UserDocuments.cs =================================================================== --- iknow-api/Models/UserDocuments.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,10 +1,0 @@ -namespace iknow_api.Models -{ - public class UserDocuments - { - public int UserId { get; set; } - public int DocumentId { get; set; } - public User? User{ get; set; } - public Documents? Documents{ get; set; } - } -} Index: iknow-api/Program.cs =================================================================== --- iknow-api/Program.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ iknow-api/Program.cs (revision c11d3a3e5ecfc9bc60609c1fae1e70e64b8e1e0a) @@ -1,94 +1,10 @@ -using System.Text; -using System.Text.Json.Serialization; -using iknow_api.Data; -using iknow_api.Models; -using iknow_api.Repositories; -using iknow_api.Services; -using Microsoft.AspNetCore.Authentication.JwtBearer; -using Microsoft.EntityFrameworkCore; -using Microsoft.IdentityModel.Tokens; - var builder = WebApplication.CreateBuilder(args); -// Add CORS policy -builder.Services.AddCors(options => -{ - options.AddPolicy("AllowFrontend", policy => - { - var allowedOrigins = builder.Configuration.GetSection("AllowedOrigins").Get() - ?? new[] { "http://localhost:3000" }; - - policy.WithOrigins(allowedOrigins) // Your frontend URL(s) - .AllowAnyHeader() - .AllowAnyMethod() - .AllowCredentials(); - }); -}); +// Add services to the container. -builder.Services.AddAuthentication(options => -{ - options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; - options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; -}) -.AddJwtBearer(options => -{ - options.RequireHttpsMetadata = false; // only for development - options.SaveToken = true; - options.TokenValidationParameters = new TokenValidationParameters - { - ValidateIssuer = true, - ValidIssuer = "iknow-api", - - ValidateAudience = true, - ValidAudience = "iknow-api", - - ValidateLifetime = true, - - ValidateIssuerSigningKey = true, - IssuerSigningKey = new SymmetricSecurityKey( - Encoding.UTF8.GetBytes(builder.Configuration["Jwt:Key"])) - }; -}); -// Add services to the container. -builder.Services.AddControllers() - .AddJsonOptions(options => - { - options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles; - options.JsonSerializerOptions.PropertyNameCaseInsensitive = true; - options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter()); - }); +builder.Services.AddControllers(); +// Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi builder.Services.AddOpenApi(); -// Register DbContext. -// The database lives behind the SSH tunnel: tunnel_scripta.cmd maps -// localhost:9999 to the faculty Postgres server. Start it before the API. -// The enum labels come from sql/ddl.sql, so each CLR enum is mapped onto its -// Postgres type by name; PgEnumLabels covers the members whose label is not -// simply the lowercased member name. -builder.Services.AddDbContext(options => - options.UseNpgsql( - builder.Configuration.GetConnectionString("DefaultConnection"), - npgsql => - { - npgsql.MapEnum("user_role", AppDbContext.ProjectSchema, PgEnumLabels.UserRole); - npgsql.MapEnum("hs_type", AppDbContext.ProjectSchema, PgEnumLabels.Lowercase); - npgsql.MapEnum("quota_type", AppDbContext.ProjectSchema, PgEnumLabels.Lowercase); - npgsql.MapEnum("semester_type", AppDbContext.ProjectSchema, PgEnumLabels.Lowercase); - npgsql.MapEnum("grade_type", AppDbContext.ProjectSchema, PgEnumLabels.Grade); - })); - -// Register your services -builder.Services.AddScoped(); -builder.Services.AddScoped(); // You'll need to add the UserRepository implementation -builder.Services.AddScoped(); - -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddAuthorization(); var app = builder.Build(); @@ -99,10 +15,8 @@ } -// Enable CORS - must be called before UseAuthentication and UseAuthorization -app.UseCors("AllowFrontend"); +app.UseHttpsRedirection(); -app.UseHttpsRedirection(); -app.UseAuthentication(); // <-- must come BEFORE UseAuthorization app.UseAuthorization(); + app.MapControllers(); Index: iknow-api/Repository/Implementations/ProfRepository.cs =================================================================== --- iknow-api/Repository/Implementations/ProfRepository.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,77 +1,0 @@ -using iknow_api.Data; -using iknow_api.Models; -using Microsoft.EntityFrameworkCore; - -namespace iknow_api.Repositories -{ - public class ProfRepository : IProfRepository - { - private readonly AppDbContext _context; - - public ProfRepository(AppDbContext context) - { - _context = context; - } - - /// - /// A professor teaches a subject for a given enrolment, so the students - /// are reached through semesters_subjects.professor_id and the student - /// through the enrolment - matching the ER model, which does not link - /// SemestersSubjects to a student directly. - /// - private IQueryable TaughtBy(int professorId) => - _context.SemesterSubjects - .Where(ss => ss.ProfessorId == professorId) - .Include(ss => ss.Subject) - .Include(ss => ss.PassedSubject) - .Include(ss => ss.EnrolledSemester!) - .ThenInclude(es => es.User) - .Include(ss => ss.EnrolledSemester!) - .ThenInclude(es => es.Semester); - - public async Task> GetTaughtSemesterSubjectsAsync(int professorId) => - await TaughtBy(professorId) - .AsNoTracking() - .AsSplitQuery() - .ToListAsync(); - - public async Task FindTaughtSemesterSubjectAsync( - int professorId, int studentId, int subjectId) - { - var candidates = await TaughtBy(professorId) - .Where(ss => ss.SubjectId == subjectId - && ss.EnrolledSemester!.UserId == studentId) - .AsSplitQuery() - .ToListAsync(); - - // Most recent enrolment first. Semesters are labelled Year/Year+1 - // throughout the app, so within one year summer follows winter. - return candidates - .OrderByDescending(ss => ss.EnrolledSemester!.Semester!.Year) - .ThenByDescending(ss => ss.EnrolledSemester!.Semester!.Type == sType.summer) - .FirstOrDefault(); - } - - public async Task GetPassedSubjectAsync(int semesterSubjectId) => - await _context.PassedSubjects - .FirstOrDefaultAsync(ps => ps.SemesterSubjectId == semesterSubjectId); - - public async Task AddPassedSubjectAsync(PassedSubject passed) - { - _context.PassedSubjects.Add(passed); - await _context.SaveChangesAsync(); - } - - public async Task UpdatePassedSubjectAsync(PassedSubject passed) - { - _context.PassedSubjects.Update(passed); - await _context.SaveChangesAsync(); - } - - public async Task RemovePassedSubjectAsync(PassedSubject passed) - { - _context.PassedSubjects.Remove(passed); - await _context.SaveChangesAsync(); - } - } -} Index: iknow-api/Repository/Implementations/RefreshTokenRepository.cs =================================================================== --- iknow-api/Repository/Implementations/RefreshTokenRepository.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,49 +1,0 @@ -using iknow_api.Models; -using iknow_api.Data; -using iknow_api.Models; -using Microsoft.EntityFrameworkCore; -using iknow_api.Services; -using iknow_api.DTOs; -using System.Runtime.CompilerServices; - -namespace iknow_api.Repositories -{ - public class RefreshTokenRepository : IRefreshTokenRepository - { - private readonly AppDbContext _context; - - public RefreshTokenRepository(AppDbContext context) - { - _context = context; - } - - public async Task AddTokenAsync(RefreshToken refreshToken) - { - _context.RefreshToken.Add(refreshToken); - await _context.SaveChangesAsync(); - } - - public Task DeleteTokenAsync(string refreshTokenDto) - { - throw new NotImplementedException(); - } - - public async Task GetUserId(string refreshTokenDto) - { - var token = await _context.RefreshToken.FirstOrDefaultAsync(u => u.Token == refreshTokenDto); - return token?.UserId ; - } - - public async Task VerifyTokenAsync(VerifyRefreshTokenDto refreshTokenDto) - { - var token = await _context.RefreshToken - .FirstOrDefaultAsync(rt => - rt.Token == refreshTokenDto.token && - rt.IsValid && - rt.ExpiresAt > DateTime.SpecifyKind(DateTime.UtcNow, DateTimeKind.Unspecified)); - - return token != null; - } - - } -} Index: iknow-api/Repository/Implementations/UserRepository.cs =================================================================== --- iknow-api/Repository/Implementations/UserRepository.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,99 +1,0 @@ -using iknow_api.Models; -using iknow_api.Data; -using Microsoft.EntityFrameworkCore; - -namespace iknow_api.Repositories -{ - public class UserRepository : IUserRepository - { - private readonly AppDbContext _context; - - public UserRepository(AppDbContext context) - { - _context = context; - } - - public async Task UserExistsAsync(string username) - { - return await _context.User.AnyAsync(u => u.Email == username); - } - - public async Task GetUserByUsernameAsync(string username) - { - return await _context.User.FirstOrDefaultAsync(u => u.Email == username); - } - - public async Task GetUserByIdAsync(int id) - { - return await _context.User - .Include(u => u.ContactInfo) - .Include(u => u.HighSchool) - // The study programme is reached through the enrolment, since - // Major hangs off EnrolledSemesters rather than off Users. - .Include(u => u.Enrolments!) - .ThenInclude(es => es.Major) - .Include(u => u.Enrolments!) - .ThenInclude(es => es.Semester) - .AsSplitQuery() - .FirstOrDefaultAsync(u => u.Id == id); - } - - - public async Task GetOnlyUserByIdAsync(int id) - { - return await _context.User.FirstOrDefaultAsync(u => u.Id == id); - } - public async Task AddUserAsync(User user) - { - _context.User.Add(user); - await _context.SaveChangesAsync(); - } - public async Task AddContactAsync(ContactInfo contactInfo) - { - _context.ContactInfo.Add(contactInfo); - await _context.SaveChangesAsync(); - } - public async Task AddHighSchoolAsync(HighSchool highSchool) - { - _context.HighSchool.Add(highSchool); - await _context.SaveChangesAsync(); - } - - public async Task GetUsersCountAsync() - { - return await _context.User.CountAsync(); - } - public async Task> GetUserSemestersAsync(int id) - { - return await _context.EnrolledSemesters - .AsNoTracking() - .Include(es => es.Major) - .Include(es => es.Semester) - .Include(es => es.SemesterSubjects) - .ThenInclude(ss => ss.Subject) - .Include(es => es.SemesterSubjects) - .ThenInclude(ss => ss.Professor) - .Where(es => es.UserId == id) - .AsSplitQuery() // This helps avoid cartesian explosion - .ToListAsync(); - } - - public async Task> GetUserPassedSubjectsAsync(int id) - { - return await _context.PassedSubjects - .AsNoTracking() - .Include(ps => ps.SemesterSubject) - .ThenInclude(ss => ss.Subject) - .Include(ps => ps.SemesterSubject) - .ThenInclude(ss => ss.EnrolledSemester) - .ThenInclude(es => es.Semester) - .Include(ps => ps.SemesterSubject) - .ThenInclude(ss => ss.Professor) - // The ER model reaches the student through the enrolment, - // not through a user_id on semesters_subjects. - .Where(ps => ps.SemesterSubject.EnrolledSemester.UserId == id) - .ToListAsync(); - } - - } -} Index: iknow-api/Repository/Interface/IProfRepository.cs =================================================================== --- iknow-api/Repository/Interface/IProfRepository.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,26 +1,0 @@ -using iknow_api.Models; - -namespace iknow_api.Repositories -{ - public interface IProfRepository - { - /// - /// Every semester-subject row taught by this professor, with the - /// enrolment, student, subject, semester and grade loaded. - /// - Task> GetTaughtSemesterSubjectsAsync(int professorId); - - /// - /// The semester-subject row this professor teaches for one student and - /// subject. When a student has taken the subject more than once, the - /// most recent enrolment wins. Null when the professor does not teach - /// that student in that subject. - /// - Task FindTaughtSemesterSubjectAsync(int professorId, int studentId, int subjectId); - - Task GetPassedSubjectAsync(int semesterSubjectId); - Task AddPassedSubjectAsync(PassedSubject passed); - Task UpdatePassedSubjectAsync(PassedSubject passed); - Task RemovePassedSubjectAsync(PassedSubject passed); - } -} Index: iknow-api/Repository/Interface/IRefreshTokenRepository.cs =================================================================== --- iknow-api/Repository/Interface/IRefreshTokenRepository.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,12 +1,0 @@ -using iknow_api.DTOs; -using iknow_api.Models; -namespace iknow_api.Repositories{ - public interface IRefreshTokenRepository - { - Task AddTokenAsync(RefreshToken refreshToken); - Task VerifyTokenAsync(VerifyRefreshTokenDto refreshTokenDto); - Task DeleteTokenAsync(string refreshTokenDto); - Task GetUserId(string refreshTokenDto); - - } -} Index: iknow-api/Repository/Interface/IUserRepository.cs =================================================================== --- iknow-api/Repository/Interface/IUserRepository.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,17 +1,0 @@ -using iknow_api.Models; -namespace iknow_api.Repositories -{ - public interface IUserRepository - { - Task UserExistsAsync(string username); - Task GetUserByUsernameAsync(string username); - Task AddUserAsync(User user); - Task AddContactAsync(ContactInfo contactInfo); - Task AddHighSchoolAsync(HighSchool highSchool); - Task GetUsersCountAsync(); - Task GetUserByIdAsync(int id); - Task?> GetUserSemestersAsync(int id); - Task GetOnlyUserByIdAsync(int id); - Task> GetUserPassedSubjectsAsync(int id); - } -} Index: iknow-api/Services/Implementations/AdminService.cs =================================================================== --- iknow-api/Services/Implementations/AdminService.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,445 +1,0 @@ -using iknow_api.Data; -using iknow_api.DTOs; -using iknow_api.Models; -using Microsoft.EntityFrameworkCore; - -namespace iknow_api.Services -{ - /// - /// Backs UC012 (subjects), UC013 (active semesters) and UC014 (professor - /// assignments). Every method reports constraint problems as a sentence - /// rather than letting a database exception reach the controller. - /// - public class AdminService : IAdminService - { - private readonly AppDbContext _context; - - public AdminService(AppDbContext context) - { - _context = context; - } - - private static string SemesterName(ActiveSemesters s) => - $"{(s.Type == sType.winter ? "Зимски" : "Летен")}({s.Year}/{s.Year + 1})"; - - // ============================================================ - // UC012 - subjects - // ============================================================ - - public async Task> GetSubjectsAsync() - { - var subjects = await _context.Subjects.AsNoTracking().ToListAsync(); - - var majorLinks = await _context.MajorSubjects.AsNoTracking() - .Include(ms => ms.Majors).ToListAsync(); - - var prerequisites = await _context.DependencySubjects.AsNoTracking().ToListAsync(); - - // A subject that students already took cannot be deleted. - var enrolledCounts = await _context.SemesterSubjects.AsNoTracking() - .GroupBy(ss => ss.SubjectId) - .Select(g => new { SubjectId = g.Key, Count = g.Count() }) - .ToDictionaryAsync(x => x.SubjectId, x => x.Count); - - var byId = subjects.ToDictionary(s => s.Id); - - return subjects - .OrderBy(s => s.Code) - .Select(s => new AdminSubjectDto - { - Id = s.Id, - Name = s.Name, - Code = s.Code, - AwardedCredits = s.AwardedCredits ?? 0, - DependencyCredit = s.DependencyCredit, - EnrolledCount = enrolledCounts.TryGetValue(s.Id, out var c) ? c : 0, - Majors = majorLinks - .Where(ms => ms.SubjectId == s.Id) - .Select(ms => new SubjectMajorDto - { - MajorId = ms.MajorId, - MajorName = ms.Majors?.Name, - MandatorySemester = ms.MandatorySemester - }) - .OrderBy(m => m.MajorName) - .ToList(), - Prerequisites = prerequisites - .Where(d => d.SubjectId == s.Id && byId.ContainsKey(d.DependencyId)) - .Select(d => new SubjectRefDto - { - Id = d.DependencyId, - Name = byId[d.DependencyId].Name, - Code = byId[d.DependencyId].Code - }) - .OrderBy(p => p.Code) - .ToList() - }) - .ToList(); - } - - public async Task CreateSubjectAsync(SubjectWriteDto request) - { - if (string.IsNullOrWhiteSpace(request.Name) || string.IsNullOrWhiteSpace(request.Code)) - { - return Fail("Name and code are required."); - } - if (request.AwardedCredits <= 0) - { - return Fail("Awarded credits must be greater than zero."); - } - // subjects.name and subjects.code are both UNIQUE. - if (await _context.Subjects.AnyAsync(s => s.Name == request.Name)) - { - return Fail($"A subject named '{request.Name}' already exists."); - } - if (await _context.Subjects.AnyAsync(s => s.Code == request.Code)) - { - return Fail($"Subject code '{request.Code}' is already taken."); - } - - var subject = new Subject - { - Name = request.Name, - Code = request.Code, - AwardedCredits = request.AwardedCredits, - DependencyCredit = request.DependencyCredit - }; - _context.Subjects.Add(subject); - await _context.SaveChangesAsync(); - - return Ok($"Subject '{subject.Name}' created.", subject.Id); - } - - public async Task UpdateSubjectAsync(int subjectId, SubjectWriteDto request) - { - var subject = await _context.Subjects.FirstOrDefaultAsync(s => s.Id == subjectId); - if (subject is null) return Fail("Subject not found."); - - if (string.IsNullOrWhiteSpace(request.Name) || string.IsNullOrWhiteSpace(request.Code)) - { - return Fail("Name and code are required."); - } - if (request.AwardedCredits <= 0) - { - return Fail("Awarded credits must be greater than zero."); - } - if (await _context.Subjects.AnyAsync(s => s.Name == request.Name && s.Id != subjectId)) - { - return Fail($"Another subject is already named '{request.Name}'."); - } - if (await _context.Subjects.AnyAsync(s => s.Code == request.Code && s.Id != subjectId)) - { - return Fail($"Subject code '{request.Code}' is already taken."); - } - - subject.Name = request.Name; - subject.Code = request.Code; - subject.AwardedCredits = request.AwardedCredits; - subject.DependencyCredit = request.DependencyCredit; - await _context.SaveChangesAsync(); - - return Ok($"Subject '{subject.Name}' updated.", subject.Id); - } - - public async Task DeleteSubjectAsync(int subjectId) - { - var subject = await _context.Subjects.FirstOrDefaultAsync(s => s.Id == subjectId); - if (subject is null) return Fail("Subject not found."); - - // semesters_subjects references subjects, so a taken subject cannot go. - var taken = await _context.SemesterSubjects.CountAsync(ss => ss.SubjectId == subjectId); - if (taken > 0) - { - return Fail($"Cannot delete: {taken} enrolment(s) already contain this subject."); - } - - await using var transaction = await _context.Database.BeginTransactionAsync(); - try - { - // The mapping rows must go first; their foreign keys would block the delete. - var prereqs = await _context.DependencySubjects - .Where(d => d.SubjectId == subjectId || d.DependencyId == subjectId) - .ToListAsync(); - _context.DependencySubjects.RemoveRange(prereqs); - - var majors = await _context.MajorSubjects - .Where(ms => ms.SubjectId == subjectId).ToListAsync(); - _context.MajorSubjects.RemoveRange(majors); - - var teaching = await _context.ProfessorSubjects - .Where(ps => ps.SubjectId == subjectId).ToListAsync(); - _context.ProfessorSubjects.RemoveRange(teaching); - - _context.Subjects.Remove(subject); - await _context.SaveChangesAsync(); - await transaction.CommitAsync(); - - return Ok($"Subject '{subject.Name}' deleted."); - } - catch - { - await transaction.RollbackAsync(); - throw; - } - } - - public async Task LinkMajorAsync(int subjectId, MajorLinkDto request) - { - if (!await _context.Subjects.AnyAsync(s => s.Id == subjectId)) - return Fail("Subject not found."); - if (!await _context.Majors.AnyAsync(m => m.Id == request.MajorId)) - return Fail("Study programme not found."); - if (request.MandatorySemester < 1) - return Fail("Semester must be 1 or greater."); - - var existing = await _context.MajorSubjects - .FirstOrDefaultAsync(ms => ms.SubjectId == subjectId && ms.MajorId == request.MajorId); - - if (existing is not null) - { - existing.MandatorySemester = request.MandatorySemester; - await _context.SaveChangesAsync(); - return Ok("Study programme mapping updated."); - } - - _context.MajorSubjects.Add(new MajorSubjects - { - SubjectId = subjectId, - MajorId = request.MajorId, - MandatorySemester = request.MandatorySemester - }); - await _context.SaveChangesAsync(); - return Ok("Subject added to the study programme."); - } - - public async Task UnlinkMajorAsync(int subjectId, int majorId) - { - var row = await _context.MajorSubjects - .FirstOrDefaultAsync(ms => ms.SubjectId == subjectId && ms.MajorId == majorId); - if (row is null) return Fail("That subject is not in that study programme."); - - _context.MajorSubjects.Remove(row); - await _context.SaveChangesAsync(); - return Ok("Subject removed from the study programme."); - } - - public async Task AddPrerequisiteAsync(int subjectId, PrerequisiteDto request) - { - if (subjectId == request.DependencyId) - { - // Mirrors CHECK (subject_id <> dependency_id). - return Fail("A subject cannot be its own prerequisite."); - } - if (!await _context.Subjects.AnyAsync(s => s.Id == subjectId)) - return Fail("Subject not found."); - if (!await _context.Subjects.AnyAsync(s => s.Id == request.DependencyId)) - return Fail("Prerequisite subject not found."); - if (await _context.DependencySubjects.AnyAsync( - d => d.SubjectId == subjectId && d.DependencyId == request.DependencyId)) - return Fail("That prerequisite is already set."); - - // Refuse a direct cycle: A requires B while B already requires A. - if (await _context.DependencySubjects.AnyAsync( - d => d.SubjectId == request.DependencyId && d.DependencyId == subjectId)) - return Fail("That would create a circular prerequisite."); - - _context.DependencySubjects.Add(new DependencySubject - { - SubjectId = subjectId, - DependencyId = request.DependencyId - }); - await _context.SaveChangesAsync(); - return Ok("Prerequisite added."); - } - - public async Task RemovePrerequisiteAsync(int subjectId, int dependencyId) - { - var row = await _context.DependencySubjects - .FirstOrDefaultAsync(d => d.SubjectId == subjectId && d.DependencyId == dependencyId); - if (row is null) return Fail("That prerequisite is not set."); - - _context.DependencySubjects.Remove(row); - await _context.SaveChangesAsync(); - return Ok("Prerequisite removed."); - } - - // ============================================================ - // UC013 - active semesters - // ============================================================ - - public async Task> GetSemestersAsync() - { - var semesters = await _context.ActiveSemesters.AsNoTracking().ToListAsync(); - var subjects = await _context.Subjects.AsNoTracking().ToListAsync(); - var teaching = await _context.ProfessorSubjects.AsNoTracking().ToListAsync(); - - var enrolments = await _context.EnrolledSemesters.AsNoTracking() - .GroupBy(es => es.SemesterId) - .Select(g => new { SemesterId = g.Key, Count = g.Count() }) - .ToDictionaryAsync(x => x.SemesterId, x => x.Count); - - return semesters - .OrderByDescending(s => s.Year) - .ThenByDescending(s => s.Type == sType.summer) - .Select(s => - { - var covered = teaching - .Where(t => t.SemesterId == s.Id) - .Select(t => t.SubjectId) - .ToHashSet(); - - return new AdminSemesterDto - { - Id = s.Id, - Year = s.Year, - Type = s.Type.ToString(), - Name = SemesterName(s), - EnrolmentCount = enrolments.TryGetValue(s.Id, out var c) ? c : 0, - UncoveredSubjects = subjects - .Where(sub => !covered.Contains(sub.Id)) - .OrderBy(sub => sub.Code) - .Select(sub => new SubjectRefDto { Id = sub.Id, Name = sub.Name, Code = sub.Code }) - .ToList() - }; - }) - .ToList(); - } - - public async Task CreateSemesterAsync(SemesterWriteDto request) - { - if (!Enum.TryParse(request.Type, ignoreCase: true, out var type)) - { - return Fail("Semester type must be 'winter' or 'summer'."); - } - if (request.Year < 2000 || request.Year > 2100) - { - return Fail("Year looks wrong; expected something between 2000 and 2100."); - } - // active_semesters has UNIQUE (year, type). - if (await _context.ActiveSemesters.AnyAsync(a => a.Year == request.Year && a.Type == type)) - { - return Fail("That semester is already open."); - } - - var semester = new ActiveSemesters { Year = request.Year, Type = type }; - _context.ActiveSemesters.Add(semester); - await _context.SaveChangesAsync(); - - return Ok($"Semester {SemesterName(semester)} opened.", semester.Id); - } - - // ============================================================ - // UC014 - professor assignments - // ============================================================ - - public async Task GetScheduleAsync(int semesterId) - { - var semester = await _context.ActiveSemesters.AsNoTracking() - .FirstOrDefaultAsync(a => a.Id == semesterId); - if (semester is null) return null; - - var subjects = await _context.Subjects.AsNoTracking().ToListAsync(); - var professors = await _context.User.AsNoTracking() - .Where(u => u.Role == Models.UserRole.Professor).ToListAsync(); - var assignments = await _context.ProfessorSubjects.AsNoTracking() - .Where(ps => ps.SemesterId == semesterId).ToListAsync(); - - var subjectById = subjects.ToDictionary(s => s.Id); - var profById = professors.ToDictionary(p => p.Id); - var covered = assignments.Select(a => a.SubjectId).ToHashSet(); - - return new ScheduleDto - { - SemesterId = semester.Id, - SemesterName = SemesterName(semester), - Assignments = assignments - .Where(a => subjectById.ContainsKey(a.SubjectId) && profById.ContainsKey(a.ProfessorId)) - .Select(a => new ScheduleRowDto - { - SubjectId = a.SubjectId, - SubjectName = subjectById[a.SubjectId].Name, - SubjectCode = subjectById[a.SubjectId].Code, - ProfessorId = a.ProfessorId, - ProfessorName = $"{profById[a.ProfessorId].Name} {profById[a.ProfessorId].Surname}".Trim() - }) - .OrderBy(r => r.SubjectCode) - .ToList(), - Load = professors - .Select(p => new ProfessorLoadDto - { - ProfessorId = p.Id, - ProfessorName = $"{p.Name} {p.Surname}".Trim(), - Subjects = assignments.Count(a => a.ProfessorId == p.Id) - }) - .OrderByDescending(l => l.Subjects).ThenBy(l => l.ProfessorName) - .ToList(), - UncoveredSubjects = subjects - .Where(s => !covered.Contains(s.Id)) - .OrderBy(s => s.Code) - .Select(s => new SubjectRefDto { Id = s.Id, Name = s.Name, Code = s.Code }) - .ToList(), - AllSubjects = subjects - .OrderBy(s => s.Code) - .Select(s => new SubjectRefDto { Id = s.Id, Name = s.Name, Code = s.Code }) - .ToList(), - Professors = professors - .OrderBy(p => p.Surname) - .Select(p => new ProfessorRefDto { Id = p.Id, Name = $"{p.Name} {p.Surname}".Trim() }) - .ToList() - }; - } - - public async Task AssignAsync(ScheduleWriteDto request) - { - var professor = await _context.User - .FirstOrDefaultAsync(u => u.Id == request.ProfessorId); - if (professor is null) return Fail("Professor not found."); - if (professor.Role != Models.UserRole.Professor) - return Fail("That user is not a professor."); - if (!await _context.ActiveSemesters.AnyAsync(a => a.Id == request.SemesterId)) - return Fail("Semester not found."); - if (!await _context.Subjects.AnyAsync(s => s.Id == request.SubjectId)) - return Fail("Subject not found."); - - var exists = await _context.ProfessorSubjects.AnyAsync( - ps => ps.ProfessorId == request.ProfessorId - && ps.SemesterId == request.SemesterId - && ps.SubjectId == request.SubjectId); - if (exists) return Ok("That assignment already exists."); - - _context.ProfessorSubjects.Add(new ProfessorSubjects - { - ProfessorId = request.ProfessorId, - SemesterId = request.SemesterId, - SubjectId = request.SubjectId - }); - await _context.SaveChangesAsync(); - return Ok("Professor assigned to the subject."); - } - - public async Task UnassignAsync(ScheduleWriteDto request) - { - var row = await _context.ProfessorSubjects.FirstOrDefaultAsync( - ps => ps.ProfessorId == request.ProfessorId - && ps.SemesterId == request.SemesterId - && ps.SubjectId == request.SubjectId); - if (row is null) return Fail("That assignment does not exist."); - - _context.ProfessorSubjects.Remove(row); - await _context.SaveChangesAsync(); - return Ok("Assignment removed."); - } - - public async Task> GetMajorsAsync() => - await _context.Majors.AsNoTracking() - .OrderBy(m => m.Name) - .Select(m => new SubjectRefDto { Id = m.Id, Name = m.Name, Code = null }) - .ToListAsync(); - - private static AdminResultDto Ok(string message, int? id = null) => - new() { Ok = true, Message = message, Id = id }; - - private static AdminResultDto Fail(string message) => - new() { Ok = false, Message = message }; - } -} Index: iknow-api/Services/Implementations/AuthService.cs =================================================================== --- iknow-api/Services/Implementations/AuthService.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,175 +1,0 @@ -using System.IdentityModel.Tokens.Jwt; -using System.Security.Claims; -using System.Text; -using BCrypt.Net; -using iknow_api.Models; -using iknow_api.DTOs; -using iknow_api.Repositories; -using Microsoft.IdentityModel.Tokens; -using iknow_api.Data; - -namespace iknow_api.Services -{ - public class AuthService : IAuthService - { - private readonly IUserRepository _userRepository; - private readonly IRefreshTokenRepository _refreshTokenRepository; - private readonly IRefreshTokenService _refreshTokenService; - private readonly IConfiguration _configuration; - private readonly AppDbContext _context; - - public AuthService(IUserRepository userRepository, IConfiguration configuration, - IRefreshTokenService refreshTokenService, IRefreshTokenRepository refreshTokenRepository, - AppDbContext context) - { - _userRepository = userRepository; - _configuration = configuration; - _refreshTokenService = refreshTokenService; - _refreshTokenRepository = refreshTokenRepository; - _context = context; - } - - public async Task RegisterAsync(RegisterDto registerDto) - { - // Debug: Log all incoming DTO values - Console.WriteLine("=== RegisterDto Debug Info ==="); - Console.WriteLine($"Name: {registerDto.Name}"); - Console.WriteLine($"Email: {registerDto.Email}"); - Console.WriteLine($"majorType: {registerDto.majorType}"); - Console.WriteLine($"enrollmentYear: {registerDto.enrollmentYear}"); - Console.WriteLine($"quotaType: {registerDto.quotaType}"); - Console.WriteLine($"Role: {registerDto.Role}"); - Console.WriteLine($"tip: {registerDto.tip}"); - Console.WriteLine("=============================="); - - // Check if user already exists - if (await _userRepository.UserExistsAsync(registerDto.Email)) - throw new InvalidOperationException("User with this email already exists"); - - // Use a transaction to ensure all entities are saved together - using var transaction = await _context.Database.BeginTransactionAsync(); - try - { - // quota and enrollment_year are attributes of Users in the ER - // model, so they are set here rather than on a separate entity. - var user = new User - { - Name = registerDto.Name, - Surname = registerDto.Surname, - Index = registerDto.Index, - Email = registerDto.Email, - PasswordHash = BCrypt.Net.BCrypt.HashPassword(registerDto.Password), - Bday = DateTime.SpecifyKind(registerDto.Bday, DateTimeKind.Unspecified), - CreatedAt = DateTime.SpecifyKind(DateTime.UtcNow, DateTimeKind.Unspecified), - Role = (Models.UserRole)registerDto.Role, - EMBG = registerDto.EMBG, - Quota = (Models.Quota)registerDto.quotaType, - EnrollmentYear = registerDto.enrollmentYear - }; - - _context.User.Add(user); - await _context.SaveChangesAsync(); - - int userId = user.Id; - - var contactInfo = new ContactInfo - { - UserId = userId, - City = registerDto.city, - Address = registerDto.address, - Municipality = registerDto.municipality, - PhoneNumber = registerDto.phoneNumber, - MicrosoftEmail = registerDto.microsoftEmail - }; - - var highSchool = new HighSchool - { - UserId = userId, - GPA = registerDto.gpa, - HighSchoolType = (Models.HighSchoolType)registerDto.tip - }; - - _context.ContactInfo.Add(contactInfo); - _context.HighSchool.Add(highSchool); - - // Save all related entities in a single transaction - await _context.SaveChangesAsync(); - await transaction.CommitAsync(); - - return true; - } - catch - { - await transaction.RollbackAsync(); - throw; - } - } - - public async Task LoginAsync(LoginDto loginDto) - { - var user = await _userRepository.GetUserByUsernameAsync(loginDto.Email); - if (user == null || !BCrypt.Net.BCrypt.Verify(loginDto.Password, user.PasswordHash)) - return null; - - var result = new AuthResultDto - { - AccessToken = CreateToken(user), - Role = user.Role.ToString() - }; - - if (loginDto.GenerateRefreshToken) - { - result.RefreshToken = await _refreshTokenService.GenerateRefreshToken(user.Id); - } - - return result; - } - - public async Task GetUsersCountAsync() - { - return await _userRepository.GetUsersCountAsync(); - } - - public async Task GenerateNewJWT(VerifyRefreshTokenDto token) - { - int userid = await _refreshTokenRepository.GetUserId(token.token) ?? 0; - User? user = await _userRepository.GetOnlyUserByIdAsync(userid); - - if (user == null) - throw new InvalidOperationException("User not found for provided refresh token."); - - return new AuthResultDto - { - AccessToken = CreateToken(user), - Role = user.Role.ToString() - }; - } - - private string CreateToken(User user) - { - var claims = new[] - { - new Claim("id", user.Id.ToString()), - new Claim("email", user.Email ?? string.Empty), - new Claim("role", user.Role.ToString()) - }; - - var keyString = _configuration["Jwt:Key"]; - if (string.IsNullOrEmpty(keyString)) - throw new Exception("JWT Key is missing in configuration!"); - - var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(keyString)); - var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256); - - var jwt = new JwtSecurityToken( - issuer: "iknow-api", - audience: "iknow-api", - claims: claims, - expires: DateTime.UtcNow.AddHours(1), - signingCredentials: creds - ); - - return new JwtSecurityTokenHandler().WriteToken(jwt); - } - } -} Index: iknow-api/Services/Implementations/EnrollmentService.cs =================================================================== --- iknow-api/Services/Implementations/EnrollmentService.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,232 +1,0 @@ -using iknow_api.Data; -using iknow_api.DTOs; -using iknow_api.Models; -using Microsoft.EntityFrameworkCore; - -namespace iknow_api.Services -{ - public class EnrollmentService : IEnrollmentService - { - /// An enrolment is exactly this many subjects. - public const int RequiredSubjects = 5; - - private readonly AppDbContext _context; - - public EnrollmentService(AppDbContext context) - { - _context = context; - } - - public async Task GetOptionsAsync(int studentId) - { - var enrolments = await _context.EnrolledSemesters - .AsNoTracking() - .Include(es => es.Semester) - .Where(es => es.UserId == studentId) - .ToListAsync(); - - var takenSemesterIds = enrolments.Select(es => es.SemesterId).ToHashSet(); - - var available = await _context.ActiveSemesters - .AsNoTracking() - .Where(a => !takenSemesterIds.Contains(a.Id)) - .ToListAsync(); - - // Semesters are labelled Year/Year+1, so within a year winter comes first. - var semesters = available - .OrderBy(a => a.Year) - .ThenBy(a => a.Type == sType.summer) - .Select(a => new SemesterOptionDto - { - Id = a.Id, - Year = a.Year, - Type = a.Type.ToString(), - Name = $"{(a.Type == sType.winter ? "Зимски" : "Летен")}({a.Year}/{a.Year + 1})" - }) - .ToList(); - - var passedSubjectIds = await _context.PassedSubjects - .AsNoTracking() - .Where(ps => ps.SemesterSubject!.EnrolledSemester!.UserId == studentId) - .Select(ps => ps.SemesterSubject!.SubjectId) - .ToListAsync(); - var passed = passedSubjectIds.ToHashSet(); - - var majorRows = await _context.MajorSubjects - .AsNoTracking() - .Include(ms => ms.Majors) - .Include(ms => ms.Subjects) - .ToListAsync(); - - var majors = majorRows - .Where(ms => ms.Majors != null && ms.Subjects != null) - .GroupBy(ms => ms.Majors!.Id) - .Select(g => new MajorOptionDto - { - Id = g.Key, - Name = g.First().Majors!.Name, - Subjects = g - .Select(ms => new SubjectOptionDto - { - Id = ms.Subjects!.Id, - Name = ms.Subjects.Name, - Code = ms.Subjects.Code, - Credits = ms.Subjects.AwardedCredits ?? 0, - MandatorySemester = ms.MandatorySemester, - AlreadyPassed = passed.Contains(ms.Subjects.Id) - }) - .OrderBy(x => x.MandatorySemester) - .ThenBy(x => x.Name) - .ToList() - }) - .OrderBy(m => m.Name) - .ToList(); - - var latest = enrolments - .Where(es => es.Semester != null) - .OrderByDescending(es => es.Semester!.Year) - .ThenByDescending(es => es.Semester!.Type == sType.summer) - .FirstOrDefault(); - - return new EnrollmentOptionsDto - { - RequiredSubjects = RequiredSubjects, - Semesters = semesters, - Majors = majors, - DefaultMajorId = latest?.MajorId - }; - } - - public async Task EnrollAsync( - int studentId, EnrollSemesterRequestDto request) - { - var subjectIds = request.SubjectIds?.Distinct().ToList() ?? new List(); - - if (subjectIds.Count != RequiredSubjects) - { - return Fail($"Pick exactly {RequiredSubjects} different subjects; got {subjectIds.Count}."); - } - - if (!await _context.ActiveSemesters.AnyAsync(a => a.Id == request.SemesterId)) - { - return Fail("That semester does not exist."); - } - - // enrolled_semesters has UNIQUE (user_id, semester_id); check first so - // the student gets a sentence rather than a constraint violation. - if (await _context.EnrolledSemesters.AnyAsync( - es => es.UserId == studentId && es.SemesterId == request.SemesterId)) - { - return Fail("You are already enrolled in that semester."); - } - - if (!await _context.Majors.AnyAsync(m => m.Id == request.MajorId)) - { - return Fail("That study programme does not exist."); - } - - var offered = await _context.MajorSubjects - .Where(ms => ms.MajorId == request.MajorId) - .Select(ms => ms.SubjectId) - .ToListAsync(); - - var notOffered = subjectIds.Except(offered).ToList(); - if (notOffered.Count > 0) - { - return Fail($"Subject(s) {string.Join(", ", notOffered)} are not offered by that study programme."); - } - - // semesters_subjects.professor_id is NOT NULL, so every chosen subject - // needs somebody teaching it that semester. - var teachers = await _context.ProfessorSubjects - .Where(ps => ps.SemesterId == request.SemesterId && subjectIds.Contains(ps.SubjectId)) - .ToListAsync(); - - // A subject can be taught by more than one professor in the same - // semester. Spread students over them instead of always taking the - // lowest id, which would leave the other professor with nobody. - var currentLoad = await _context.SemesterSubjects - .Where(ss => subjectIds.Contains(ss.SubjectId) - && ss.EnrolledSemester!.SemesterId == request.SemesterId) - .GroupBy(ss => new { ss.SubjectId, ss.ProfessorId }) - .Select(g => new { g.Key.SubjectId, g.Key.ProfessorId, Count = g.Count() }) - .ToListAsync(); - - var loadLookup = currentLoad.ToDictionary( - x => (x.SubjectId, x.ProfessorId), x => x.Count); - - var professorBySubject = teachers - .GroupBy(ps => ps.SubjectId) - .ToDictionary( - g => g.Key, - // Fewest students first; professor id only breaks ties, so - // the choice stays deterministic and testable. - g => g.OrderBy(ps => loadLookup.TryGetValue((ps.SubjectId, ps.ProfessorId), out var n) ? n : 0) - .ThenBy(ps => ps.ProfessorId) - .First().ProfessorId); - - var untaught = subjectIds.Where(id => !professorBySubject.ContainsKey(id)).ToList(); - if (untaught.Count > 0) - { - return Fail($"Subject(s) {string.Join(", ", untaught)} are not taught in that semester."); - } - - var student = await _context.User.FirstOrDefaultAsync(u => u.Id == studentId); - if (student is null) - { - return Fail("Student not found."); - } - - var now = DateTime.SpecifyKind(DateTime.UtcNow, DateTimeKind.Unspecified); - - await using var transaction = await _context.Database.BeginTransactionAsync(); - try - { - var enrolment = new EnrolledSemesters - { - UserId = studentId, - SemesterId = request.SemesterId, - MajorId = request.MajorId, - // enrolled_semesters.quota is NOT NULL; fall back to the - // state quota when the student record has none. - QuotaType = student.Quota ?? Models.Quota.drzavna, - CratedAt = now, - LastChange = now, - Verified = null - }; - - _context.EnrolledSemesters.Add(enrolment); - await _context.SaveChangesAsync(); - - foreach (var subjectId in subjectIds) - { - _context.SemesterSubjects.Add(new SemesterSubject - { - EnrolledSemesterId = enrolment.Id, - SubjectId = subjectId, - ProfessorId = professorBySubject[subjectId], - Signature = false - }); - } - - await _context.SaveChangesAsync(); - await transaction.CommitAsync(); - - return new EnrollSemesterResultDto - { - Ok = true, - Message = $"Enrolled with {subjectIds.Count} subjects.", - EnrolledSemesterId = enrolment.Id - }; - } - catch - { - await transaction.RollbackAsync(); - throw; - } - } - - private static EnrollSemesterResultDto Fail(string message) => - new() { Ok = false, Message = message }; - } -} Index: iknow-api/Services/Implementations/ProfService.cs =================================================================== --- iknow-api/Services/Implementations/ProfService.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,122 +1,0 @@ -using iknow_api.DTOs; -using iknow_api.Models; -using iknow_api.Repositories; - -namespace iknow_api.Services -{ - public class ProfService : IProfService - { - private readonly IProfRepository _profRepository; - - public ProfService(IProfRepository profRepository) - { - _profRepository = profRepository; - } - - public async Task> GetStudentsBySubjectAsync(int professorId) - { - var taught = await _profRepository.GetTaughtSemesterSubjectsAsync(professorId); - - return taught - .Where(ss => ss.Subject != null && ss.EnrolledSemester?.User != null) - .GroupBy(ss => ss.Subject!.Id) - .Select(group => - { - var subject = group.First().Subject!; - return new SubjectStudentsDto - { - Id = subject.Id, - Name = subject.Name, - Code = subject.Code, - Users = group - .Select(ss => - { - var student = ss.EnrolledSemester!.User!; - var semester = ss.EnrolledSemester.Semester; - return new EnrolledStudentDto - { - Id = student.Id, - Name = $"{student.Name} {student.Surname}".Trim(), - Index = student.Index, - // 0 means "not graded yet"; the enum starts at 6. - Grade = ss.PassedSubject is null ? 0 : (int)ss.PassedSubject.Grade, - Semester = semester is null - ? null - : $"{(semester.Type == sType.winter ? "Зимски" : "Летен")}({semester.Year}/{semester.Year + 1})" - }; - }) - .OrderBy(u => u.Name) - .ToList() - }; - }) - .OrderBy(s => s.Name) - .ToList(); - } - - public async Task SetGradeAsync( - int professorId, GradeRequestDto request, GradeAction action) - { - // grade_type only declares 6..10, so anything else cannot be stored. - if (action != GradeAction.Remove && !Enum.IsDefined(typeof(Grade), request.Grade)) - { - return Fail($"Grade must be between 6 and 10; got {request.Grade}."); - } - - // This also enforces authorisation: the lookup is scoped to the - // subjects this professor actually teaches. - var semesterSubject = await _profRepository.FindTaughtSemesterSubjectAsync( - professorId, request.StudentId, request.SubjectId); - - if (semesterSubject is null) - { - return Fail("You do not teach this student in this subject."); - } - - var existing = await _profRepository.GetPassedSubjectAsync(semesterSubject.Id); - - switch (action) - { - case GradeAction.Add: - if (existing is not null) - { - return Fail("This subject is already graded. Use edit to change the grade."); - } - await _profRepository.AddPassedSubjectAsync(new PassedSubject - { - SemesterSubjectId = semesterSubject.Id, - Grade = (Grade)request.Grade, - // date_passed is `timestamp without time zone`. - DatePassed = DateTime.SpecifyKind(DateTime.UtcNow, DateTimeKind.Unspecified) - }); - return Ok($"Grade {request.Grade} added."); - - case GradeAction.Edit: - if (existing is null) - { - return Fail("This subject has no grade yet. Use add first."); - } - existing.Grade = (Grade)request.Grade; - existing.DatePassed = DateTime.SpecifyKind(DateTime.UtcNow, DateTimeKind.Unspecified); - await _profRepository.UpdatePassedSubjectAsync(existing); - return Ok($"Grade changed to {request.Grade}."); - - case GradeAction.Remove: - if (existing is null) - { - return Fail("This subject has no grade to remove."); - } - await _profRepository.RemovePassedSubjectAsync(existing); - return Ok("Grade removed."); - - default: - return Fail("Unknown action."); - } - } - - private static GradeResultDto Ok(string message) => - new() { Ok = true, Message = message }; - - private static GradeResultDto Fail(string message) => - new() { Ok = false, Message = message }; - } -} Index: iknow-api/Services/Implementations/RefreshTokenService.cs =================================================================== --- iknow-api/Services/Implementations/RefreshTokenService.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,50 +1,0 @@ -using iknow_api.DTOs; -using iknow_api.Services; -using System.Security.Cryptography; -using iknow_api.Models; -using iknow_api.Models; -using iknow_api.Repositories; - -namespace iknow_api.Services -{ - public class RefreshTokenService : IRefreshTokenService - { - private readonly IRefreshTokenRepository _refreshTokenRepository; - public RefreshTokenService(IRefreshTokenRepository refreshTokenRepository) - { - _refreshTokenRepository = refreshTokenRepository; - } - - public async Task GenerateRefreshToken(int userid) - { - var randomNumber = new byte[32]; - - using (var rng = RandomNumberGenerator.Create()) - { - rng.GetBytes(randomNumber); - } - - var refreshToken = Convert.ToBase64String(randomNumber); - - RefreshToken refreshTokenModel = new RefreshToken - { - Token = refreshToken, - UserId = userid, - ExpiresAt = DateTime.SpecifyKind(DateTime.UtcNow.AddMonths(1), DateTimeKind.Unspecified), - IsValid = true - }; - - await _refreshTokenRepository.AddTokenAsync(refreshTokenModel); - - return refreshToken; - } - - public async Task VerifyRefreshToken(VerifyRefreshTokenDto refreshTokenDto) - { - - return await _refreshTokenRepository.VerifyTokenAsync(refreshTokenDto); - } - - - } -} Index: iknow-api/Services/Implementations/UserService.cs =================================================================== --- iknow-api/Services/Implementations/UserService.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,105 +1,0 @@ -using iknow_api.Repositories; -using iknow_api.Services; -using iknow_api.DTOs; -using Microsoft.AspNetCore.Http.HttpResults; -using System.IdentityModel.Tokens.Jwt; -using System.Security.Claims; -using System.Text; -using Microsoft.IdentityModel.Tokens; -using iknow_api.Models; - -namespace iknow_api.Services -{ - public class UserService : IUserService - { - - private readonly IUserRepository _userRepository; - private readonly IConfiguration _configuration; - public UserService(IUserRepository userRepository, IConfiguration configuration) - { - _userRepository = userRepository; - _configuration = configuration; - } - public async Task GetUserData(string JWT) - { - var userId = ExtractUserIdFromJwt(JWT); - if (userId == null) - return null; - - // Now you can use userId to fetch user data - var user = await _userRepository.GetUserByIdAsync(userId.Value); - if(user == null) - return null; - else - return user; - } - public async Task> GetUserSemesters(string JWT) - { - var userId = ExtractUserIdFromJwt(JWT); - if (userId == null) - return null; - - // Now you can use userId to fetch user data - var semesters = await _userRepository.GetUserSemestersAsync(userId.Value); - if (semesters == null) - return null; - else - return semesters; - } - - public async Task> GetUserPassedSubjects(string JWT) - { - var userId = ExtractUserIdFromJwt(JWT); - if (userId == null) - return null; - - var passedSubjects = await _userRepository.GetUserPassedSubjectsAsync(userId.Value); - if (passedSubjects == null) - return null; - else - return passedSubjects; - } - - private int? ExtractUserIdFromJwt(string token) - { - try - { - var tokenHandler = new JwtSecurityTokenHandler(); - var keyString = _configuration["Jwt:Key"]; - - if (string.IsNullOrEmpty(keyString)) - return null; - - var key = Encoding.UTF8.GetBytes(keyString); - - var validationParameters = new TokenValidationParameters - { - ValidateIssuerSigningKey = true, - IssuerSigningKey = new SymmetricSecurityKey(key), - ValidateIssuer = true, - ValidIssuer = "iknow-api", - ValidateAudience = true, - ValidAudience = "iknow-api", - ValidateLifetime = true, - ClockSkew = TimeSpan.Zero - }; - - var principal = tokenHandler.ValidateToken(token, validationParameters, out SecurityToken validatedToken); - - // Extract the "id" claim that was set in AuthService.CreateToken - var userIdClaim = principal.FindFirst("id"); - - if (userIdClaim != null && int.TryParse(userIdClaim.Value, out int userId)) - { - return userId; - } - - return null; - } - catch - { - return null; - } - } - } -} Index: iknow-api/Services/Interfaces/IAdminService.cs =================================================================== --- iknow-api/Services/Interfaces/IAdminService.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,28 +1,0 @@ -using iknow_api.DTOs; - -namespace iknow_api.Services -{ - public interface IAdminService - { - // UC012 - subjects - Task> GetSubjectsAsync(); - Task CreateSubjectAsync(SubjectWriteDto request); - Task UpdateSubjectAsync(int subjectId, SubjectWriteDto request); - Task DeleteSubjectAsync(int subjectId); - Task LinkMajorAsync(int subjectId, MajorLinkDto request); - Task UnlinkMajorAsync(int subjectId, int majorId); - Task AddPrerequisiteAsync(int subjectId, PrerequisiteDto request); - Task RemovePrerequisiteAsync(int subjectId, int dependencyId); - - // UC013 - active semesters - Task> GetSemestersAsync(); - Task CreateSemesterAsync(SemesterWriteDto request); - - // UC014 - professor assignments - Task GetScheduleAsync(int semesterId); - Task AssignAsync(ScheduleWriteDto request); - Task UnassignAsync(ScheduleWriteDto request); - - Task> GetMajorsAsync(); - } -} Index: iknow-api/Services/Interfaces/IAuthService.cs =================================================================== --- iknow-api/Services/Interfaces/IAuthService.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,13 +1,0 @@ -using iknow_api.DTOs; -using iknow_api.Models; -namespace iknow_api.Services -{ - public interface IAuthService - { - Task RegisterAsync(RegisterDto registerDto); - Task LoginAsync(LoginDto loginDto); - Task GetUsersCountAsync(); - Task GenerateNewJWT(VerifyRefreshTokenDto token); - - } -} Index: iknow-api/Services/Interfaces/IEnrollmentService.cs =================================================================== --- iknow-api/Services/Interfaces/IEnrollmentService.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,16 +1,0 @@ -using iknow_api.DTOs; - -namespace iknow_api.Services -{ - public interface IEnrollmentService - { - /// The semesters, majors and subjects this student may enrol in. - Task GetOptionsAsync(int studentId); - - /// - /// Creates one enrolled_semesters row and its semesters_subjects rows, - /// or returns why it could not. - /// - Task EnrollAsync(int studentId, EnrollSemesterRequestDto request); - } -} Index: iknow-api/Services/Interfaces/IProfService.cs =================================================================== --- iknow-api/Services/Interfaces/IProfService.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,18 +1,0 @@ -using iknow_api.DTOs; - -namespace iknow_api.Services -{ - public enum GradeAction - { - Add, - Edit, - Remove - } - - public interface IProfService - { - Task> GetStudentsBySubjectAsync(int professorId); - - Task SetGradeAsync(int professorId, GradeRequestDto request, GradeAction action); - } -} Index: iknow-api/Services/Interfaces/IRefreshTokenService.cs =================================================================== --- iknow-api/Services/Interfaces/IRefreshTokenService.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,10 +1,0 @@ -using iknow_api.DTOs; - -namespace iknow_api.Services -{ - public interface IRefreshTokenService - { - Task VerifyRefreshToken(VerifyRefreshTokenDto refreshTokenDto); - Task GenerateRefreshToken(int userid); - } -} Index: iknow-api/Services/Interfaces/IUserService.cs =================================================================== --- iknow-api/Services/Interfaces/IUserService.cs (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,11 +1,0 @@ -using iknow_api.DTOs; -using iknow_api.Models; -namespace iknow_api.Services -{ - public interface IUserService - { - Task GetUserData(string userId); - Task> GetUserSemesters(string userId); - Task> GetUserPassedSubjects(string userId); - } -} Index: iknow-api/WeatherForecast.cs =================================================================== --- iknow-api/WeatherForecast.cs (revision c11d3a3e5ecfc9bc60609c1fae1e70e64b8e1e0a) +++ iknow-api/WeatherForecast.cs (revision c11d3a3e5ecfc9bc60609c1fae1e70e64b8e1e0a) @@ -0,0 +1,13 @@ +namespace iknow_api +{ + public class WeatherForecast + { + public DateOnly Date { get; set; } + + public int TemperatureC { get; set; } + + public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); + + public string? Summary { get; set; } + } +} Index: iknow-api/appsettings.Development.json.example =================================================================== --- iknow-api/appsettings.Development.json.example (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ (revision ) @@ -1,14 +1,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "ConnectionStrings": { - "DefaultConnection": "Host=localhost;Port=9999;Database=db_202526z_va_prj_know2026;Username=db_202526z_va_prj_iknow2026_owner;Password=YOUR_DB_PASSWORD_HERE;Search Path=project;Include Error Detail=true" - }, - "Jwt": { - "Key": "ANY_LOCAL_SIGNING_KEY_AT_LEAST_32_CHARACTERS_LONG" - } -} Index: iknow-api/appsettings.json =================================================================== --- iknow-api/appsettings.json (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ iknow-api/appsettings.json (revision c11d3a3e5ecfc9bc60609c1fae1e70e64b8e1e0a) @@ -6,8 +6,4 @@ } }, - "AllowedOrigins": [ - "http://localhost:3000", - "https://iknow-remaster.vercel.app" - ], "AllowedHosts": "*" } Index: iknow-api/iknow-api.csproj =================================================================== --- iknow-api/iknow-api.csproj (revision ea405569ef29f56fbfc4d77708b6b3faf9286097) +++ iknow-api/iknow-api.csproj (revision c11d3a3e5ecfc9bc60609c1fae1e70e64b8e1e0a) @@ -9,13 +9,5 @@ - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - -