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