Merge branch 'dev' into kysymyksen-kopiointi

.github/workflows/scala.yml

@@ -0,0 +1,55 @@
+name: Exam
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_DB: sitnet_test
+          POSTGRES_USER: sitnet
+          POSTGRES_PASSWORD: sitnetsitnet
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Set up JDK 21
+      uses: actions/setup-java@v2
+      with:
+        java-version: 21
+        distribution: temurin
+
+    - name: Set up Node 18
+      uses: actions/setup-node@v4
+      with:
+        node-version: 18.x
+
+    - name: Build UI
+      run: |
+        cd ui
+        rm -rf node_modules
+        npm i
+        npm run check-format
+        npm run check-lint
+        npm run build
+        cd ..
+
+    - name: Run tests
+      run: |
+        sed -i 's/\/var\/log\/exam/logs/g' $GITHUB_WORKSPACE/conf/logback.xml
+        sbt test
+
+

app/controllers/ReservationController.java

@@ -71,7 +71,7 @@ public class ReservationController extends BaseController {
 
     @Authenticated
     @Restrict({ @Group("ADMIN"), @Group("TEACHER") })
-    public Result getExams(Http.Request request) {
+    public Result getExams(Http.Request request, Optional<String> filter) {
         User user = request.attrs().get(Attrs.AUTHENTICATED_USER);
         PathProperties props = PathProperties.parse("(id, name)");
         Query<Exam> q = DB.createQuery(Exam.class);
@@ -80,6 +80,9 @@ public Result getExams(Http.Request request) {
             .where()
             .isNull("parent") // only Exam prototypes
             .eq("state", Exam.State.PUBLISHED);
+        if (filter.isPresent()) {
+            el = el.ilike("name", String.format("%%%s%%", filter.get()));
+        }
         if (user.hasRole(Role.Name.TEACHER)) {
             el =
                 el
@@ -91,7 +94,8 @@ public Result getExams(Http.Request request) {
                     .eq("shared", true)
                     .endJunction();
         }
-        return ok(el.findList(), props);
+        List<Exam> exams = el.findList();
+        return ok(exams, props);
     }
 
     @Restrict({ @Group("ADMIN") })
@@ -119,15 +123,23 @@ private ArrayNode asJson(List<User> users) {
     }
 
     @Restrict({ @Group("ADMIN"), @Group("TEACHER") })
-    public Result getStudents() {
-        List<User> students = DB.find(User.class).where().eq("roles.name", "STUDENT").findList();
+    public Result getStudents(Optional<String> filter) {
+        ExpressionList<User> el = DB.find(User.class).where().eq("roles.name", "STUDENT");
+        if (filter.isPresent()) {
+            el = el.or().ilike("userIdentifier", String.format("%%%s%%", filter.get()));
+            el = applyUserFilter(null, el, filter.get()).endOr();
+        }
+        List<User> students = el.findList();
         return ok(Json.toJson(asJson(students)));
     }
 
     @Restrict({ @Group("ADMIN") })
-    public Result getTeachers() {
-        List<User> teachers = DB.find(User.class).where().eq("roles.name", "TEACHER").findList();
-
+    public Result getTeachers(Optional<String> filter) {
+        ExpressionList<User> el = DB.find(User.class).where().eq("roles.name", "TEACHER");
+        if (filter.isPresent()) {
+            el = applyUserFilter(null, el.or(), filter.get()).endOr();
+        }
+        List<User> teachers = el.findList();
         return ok(Json.toJson(asJson(teachers)));
     }
 
@@ -155,7 +167,7 @@ public CompletionStage<Result> removeReservation(long id, Http.Request request)
         }
 
         Reservation reservation = enrolment.getReservation();
-        // Lets not send emails about historical reservations
+        // Let's not send emails about historical reservations
         if (reservation.getEndAt().isAfter(DateTime.now())) {
             User student = enrolment.getUser();
             emailComposer.composeReservationCancellationNotification(student, reservation, msg, false, enrolment);

app/controllers/base/BaseController.java

@@ -95,7 +95,7 @@ protected <T> ExpressionList<T> applyUserFilter(String prefix, ExpressionList<T>
         String fnField = prefix == null ? "firstName" : String.format("%s.firstName", prefix);
         String lnField = prefix == null ? "lastName" : String.format("%s.lastName", prefix);
         if (rawFilter.contains(" ")) {
-            // Possible that user provided us two names. Lets try out some combinations of first and last names
+            // Possible that user provided us two names. Let's try out some combinations of first and last names
             String name1 = rawFilter.split(" ")[0];
             String name2 = rawFilter.split(" ")[1];
             result =

app/controllers/iop/collaboration/impl/CollaborationController.java

@@ -13,6 +13,8 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
@@ -71,10 +73,13 @@ Optional<URL> parseUrlWithSearchParam(String filter, boolean anonymous) {
             if (filter == null) {
                 return Optional.empty();
             }
-
-            String paramStr = String.format("?filter=%s&anonymous=%s", filter, anonymous);
-            String url = String.format("%s/api/exams/search%s", configReader.getIopHost(), paramStr);
-            return Optional.of(URI.create(url).toURL());
+            String paramStr = String.format(
+                "filter=%s&anonymous=%s",
+                URLEncoder.encode(filter, StandardCharsets.UTF_8),
+                anonymous
+            );
+            URI uri = URI.create(String.format("%s/api/exams/search?%s", configReader.getIopHost(), paramStr));
+            return Optional.of(uri.toURL());
         } catch (MalformedURLException e) {
             logger.error("Malformed URL", e);
             return Optional.empty();

conf/routes

@@ -221,10 +221,10 @@ GET           /app/accessibility                                       controlle
 
 GET           /app/draft/rooms                                         controllers.RoomController.createExamRoomDraft
 
-GET           /app/reservations/students                               controllers.ReservationController.getStudents
-GET           /app/reservations/teachers                               controllers.ReservationController.getTeachers
+GET           /app/reservations/students                               controllers.ReservationController.getStudents(filter: java.util.Optional[String])
+GET           /app/reservations/teachers                               controllers.ReservationController.getTeachers(filter: java.util.Optional[String])
 GET           /app/reservations/examrooms                              controllers.ReservationController.getExamRooms
-GET           /app/reservations/exams                                  controllers.ReservationController.getExams(request: Request)
+GET           /app/reservations/exams                                  controllers.ReservationController.getExams(request: Request, filter: java.util.Optional[String])
 GET           /app/reservations                                        controllers.ReservationController.getReservations(state: java.util.Optional[String], ownerId: java.util.Optional[java.lang.Long], studentId: java.util.Optional[java.lang.Long], roomId: java.util.Optional[java.lang.Long], machineId: java.util.Optional[java.lang.Long], examId: java.util.Optional[java.lang.Long], start: java.util.Optional[String], end: java.util.Optional[String], externalRef: java.util.Optional[String], request: Request)
 GET           /app/events                                              controllers.ReservationController.getExaminationEvents(state: java.util.Optional[String], ownerId: java.util.Optional[java.lang.Long], studentId: java.util.Optional[java.lang.Long], examId: java.util.Optional[java.lang.Long], start: java.util.Optional[String], end: java.util.Optional[String], request: Request)
 DELETE        /app/reservations/:id                                    controllers.ReservationController.removeReservation(id: Long, request: Request)

ui/src/app/dashboard/staff/admin/admin-dashboard.component.ts

@@ -16,6 +16,6 @@ import { Component } from '@angular/core';
 
 @Component({
     selector: 'xm-admin-dashboard',
-    template: '<xm-admin-reservations></xm-admin-reservations>',
+    template: '<xm-reservations></xm-reservations>',
 })
 export class AdminDashboardComponent {}

ui/src/app/dashboard/staff/admin/admin-dashboard.module.ts

@@ -12,6 +12,7 @@
  * on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Licence for the specific language governing permissions and limitations under the Licence.
  */
+// TODO: maybe this module is redundant. Let's keep it anyway in case we want to lazy load admin stuff in the future
 import { NgModule } from '@angular/core';
 import { ReservationModule } from '../../../reservation/reservation.module';
 import { SharedModule } from '../../../shared/shared.module';

ui/src/app/dashboard/staff/staff-routing.module.ts

@@ -34,7 +34,7 @@ import { LanguageInspectionsComponent } from '../../maturity/language-inspection
 import { MaturityReportingComponent } from '../../maturity/reporting/maturity-reporting.component';
 import { QuestionComponent } from '../../question/basequestion/question.component';
 import { LibraryComponent } from '../../question/library/library.component';
-import { TeacherReservationComponent } from '../../reservation/teacher/teacher-reservations.component';
+import { ReservationsComponent } from '../../reservation/reservations.component';
 import { AssessmentComponent } from '../../review/assessment/assessment.component';
 import { PrintedAssessmentComponent } from '../../review/assessment/print/printed-assessment.component';
 import { SpeedReviewComponent } from '../../review/listing/speed-review.component';
@@ -152,8 +152,8 @@ const routes: Route[] = [
             { path: 'inspections', component: LanguageInspectionsComponent },
             { path: 'inspections/reports', component: MaturityReportingComponent },
             { path: 'adminexams', component: ExamListingComponent },
-            { path: 'reservations', component: TeacherReservationComponent },
-            { path: 'reservations/:eid', component: TeacherReservationComponent },
+            { path: 'reservations', component: ReservationsComponent },
+            { path: 'reservations/:eid', component: ReservationsComponent },
             { path: 'rooms', component: FacilityComponent },
             { path: 'rooms/:id', component: RoomComponent },
             { path: 'rooms/:id/availability', component: AvailabilityComponent },