Mermutef/LMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Defense: keep assignment text for admins, hide it only from students

Browse Source
This commit is contained in:
Vladislav Kopnin
2026-09-28 17:30:11 +03:00
parent f630b0267e
commit 6d1b36f02e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/progress-service/src/main/kotlin/ru/ysu/lms/progress/DefenseMyController.kt
View File

@@ -22,15 +22,17 @@ class DefenseMyController(
@GetMapping @GetMapping
fun my( fun my(
@AuthenticationPrincipal jwt: Jwt, @AuthenticationPrincipal jwt: Jwt,
): List<DefenseDto> = service.mySessions(UUID.fromString(jwt.subject)).map { hideCode(it) } ): List<DefenseDto> = service.mySessions(UUID.fromString(jwt.subject)).map { hideForStudent(it) }
@GetMapping("/{labId}") @GetMapping("/{labId}")
fun one( fun one(
@PathVariable labId: UUID, @PathVariable labId: UUID,
@AuthenticationPrincipal jwt: Jwt, @AuthenticationPrincipal jwt: Jwt,
): DefenseDto? = service.mySession(UUID.fromString(jwt.subject), labId)?.let { hideCode(it) } ): DefenseDto? = service.mySession(UUID.fromString(jwt.subject), labId)?.let { hideForStudent(it) }
private fun hideCode(d: DefenseDto): DefenseDto = if (d.status == DefenseStatus.waiting.name) d.copy(code = null) else d /** Студент не должен видеть ни код, ни текст задания до ввода кода. */
private fun hideForStudent(d: DefenseDto): DefenseDto =
if (d.status == DefenseStatus.waiting.name) d.copy(code = null, assignmentMd = "") else d
@PostMapping("/start") @PostMapping("/start")
fun start( fun start(

2
services/progress-service/src/main/kotlin/ru/ysu/lms/progress/DefenseService.kt
View File

@@ -204,7 +204,7 @@ class DefenseService(
labId = s.labId.toString(), labId = s.labId.toString(),
status = s.status, status = s.status,
code = s.code, code = s.code,
assignmentMd = if (s.status == DefenseStatus.waiting.name) "" else s.assignmentMd, assignmentMd = s.assignmentMd,
startedAt = s.startedAt?.toString(), startedAt = s.startedAt?.toString(),
readyAt = s.readyAt?.toString(), readyAt = s.readyAt?.toString(),
readyReason = s.readyReason, readyReason = s.readyReason,