Skip to content
Snippets Groups Projects
Commit c3dffe51 authored by Hamza Remmal's avatar Hamza Remmal
Browse files

Merge branch 'hj/fixSubmissionInfo' into 'master'

Fix : return user.idnumber instead of user.id in user.identifier

See merge request !253
parents 54e5dea8 f23794f3
Branches
Tags
1 merge request!253Fix : return user.idnumber instead of user.id in user.identifier
Pipeline #210900 passed
......@@ -20,7 +20,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
......@@ -297,7 +296,7 @@ public final class KubernetesJobService {
private String concat_ids(List<User> list){
String[] users_ids = new String[list.size()];
for(int i=0; i<list.size() ; i++ ){
users_ids[i] = String.valueOf(list.get(i).id());
users_ids[i] = list.get(i).idnumber();
}
return String.join("-",users_ids);
......@@ -323,7 +322,7 @@ public final class KubernetesJobService {
final var labels = Map.of(
"autograde.version", autograde.getVersion(),
"course.short-name", KubernetesPreprocessor.preprocessLabel(request.course().shortName()),
"user.identifier", KubernetesPreprocessor.preprocessLabel(request.user().identifier()),
"user.identifier", KubernetesPreprocessor.preprocessLabel(concat_ids(request.users())),
"assignment.id", KubernetesPreprocessor.preprocessLabel(valueOf(request.assignment().id())),
"submission.id", KubernetesPreprocessor.preprocessLabel(valueOf(request.submission().id())),
"submission.attempt", KubernetesPreprocessor.preprocessLabel(valueOf(request.submission().attempt()))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment