Merge branch 'staging' into 'master'

Merge to master to test build stage in pipeline

See merge request !4

.gitignore

+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/

.gitlab-ci.yml

+image: gradle:6.7-jdk14
+
 stages:
+  - build
   - test
 
-golang:
-  stage: test
+before_script:
+  #  - echo `pwd` # debug
+  #  - echo "$CI_BUILD_NAME, $CI_BUILD_REF_NAME $CI_BUILD_STAGE" # debug
+  - export GRADLE_USER_HOME=`pwd`/.gradle
+
+variables:
+  GRADLE_OPTS: "-Dorg.gradle.daemon=false"
+  JACOCO_CSV_LOCATION: '$CI_PROJECT_DIR/build/jacocoCsv'
+
+build:
+  stage: build
   script:
-    - go get -u github.com/jstemmer/go-junit-report
-    - go test -v 2>&1 | go-junit-report -set-exit-code > report.xml
+    - gradle assemble
   artifacts:
-    when: always
-    reports:
-      junit: report.xml
\ No newline at end of file
+    paths:
+      - build/libs/*.jar
+    expire_in: 1 week
+  only:
+    - master
+
+test:
+  stage: test
+  script:
+    - gradle check
+    - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, " instructions covered"; print 100*covered/instructions, "% covered" }' $JACOCO_CSV_LOCATION
\ No newline at end of file

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectKey">
     <option name="state" value="project://e2804f05-5315-4fc6-a121-c522a6c26470" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="15" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_14" default="true" project-jdk-name="14" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file

.idea/modules.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/tasc.iml" filepath="$PROJECT_DIR$/tasc.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

README.md

 # Group4-SoftEng
 
+### Master Code Coverage <br>
+[![master coverage report](https://gitlab.cs.ui.ac.id/g4-ppl/group4-softeng/badges/master/coverage.svg)](https://gitlab.cs.ui.ac.id/g4-ppl/group4-softeng/-/commits/master)
+
+### Staging Code Coverage <br>
+[![staging coverage report](https://gitlab.cs.ui.ac.id/g4-ppl/group4-softeng/badges/staging/coverage.svg)](https://gitlab.cs.ui.ac.id/g4-ppl/group4-softeng/-/commits/staging)
+
 **Members:**
 - Jerome Emmanuel 1906426840
 - Mohammad Saddam Mashuri 1906426891

build.gradle

+plugins {
+    id 'groovy'
+    id 'java'
+    id 'jacoco'
+}
+
+apply plugin: "application"
+
+group 'softeng.g4'
+version '1.0-SNAPSHOT'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+    // This dependency is used by the application.
+    implementation 'com.google.guava:guava:30.0-jre'
+
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(14))
+    }
+}
+
+test {
+    useJUnitPlatform()
+    finalizedBy("jacocoTestReport")
+}
+
+jacocoTestReport {
+    reports {
+        csv.enabled true
+        csv.destination file("${buildDir}/jacocoCsv")
+    }
+    // ... Additional configuration for JaCoCo
+}
\ No newline at end of file

gradle/wrapper/gradle-wrapper.properties

+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

gradlew.bat

+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle

+rootProject.name = 'tasc'
+

src/main/java/softeng/g4/Main.java

+package softeng.g4;
+
+import jdk.swing.interop.SwingInterOpUtils;
+import softeng.g4.appointment.Appointment;
+import softeng.g4.cli.AdminCLI;
+import softeng.g4.cli.ListIO;
+import softeng.g4.cli.StudentCLI;
+import softeng.g4.cli.TACLI;
+import softeng.g4.course.Course;
+import softeng.g4.course.CourseList;
+import softeng.g4.user.*;
+
+import java.io.*;
+import java.util.*;
+
+public class Main {
+
+    /**
+     * TODOS for something general
+     * TODO: Needs refactoring and exception handling!!!! (especially the latter one)
+     * TODO: Create a class / method(s) for handling storage. Maybe something like ListIO?
+     * TODO: Create classes for different user types (TACLI, STUDENTCLI, ADMINCLI), and use them in the Main class
+     * It should be possible to make login of each user types to different classes,
+     * rather than using switch cases like a madman.
+     */
+
+    /**
+     * TODOs for "LOG IN" FEATURE
+     * IT's DONE. You can login by using their username.
+     * Ex: S akuStudent
+     * Ex: T akuTA
+     * Ex: A akuAdmin
+     *
+     * If you want to register a new user,
+     * you'll have to run a constructor of Student / TeachingAssistant / Admin
+     * Ex: New Student("exampleUsername", "Example Fullname", Long.valueOf("exampleNPM"), userList);
+     */
+
+    /**
+     * TODOs for "APPOINTMENT" FEATURE
+     * TODO: Implement the methods and attributes in the Appointment.java
+     * TODO: Implement the methods and attributes in the RequestAppointment.java
+     * TODO: Edit Main.java's intro methods, switch cases, Student.java, TeachingAssistant.java, Admin.java,
+     * Appointment.java, RequestAppointment.java, and maybe more, such that:
+     * - Student can add appointments
+     * - TeachingAssistant can accept / reject appointment by changing the appointment status
+     * - Both Student and TeachingAssistant can see the appointment details
+     * - Admin can ask permission to see the appointment details, which then they're able to see the appointment
+     * TODO: After all this TODOs are done, change Main.java such that it doesn't use the hardcoded version again
+     */
+
+    public static void main(String[] args) {
+        Scanner sc = new Scanner(System.in);
+        String q = "";
+        String currentLogin = "";
+        CourseList courseList;
+        UserList userList;
+
+        // --------Uncomment all of this for the "hardcoded" version.
+        // Uncomment to add a new fresh userList and courseList
+        courseList = new CourseList();
+        userList = new UserList();
+
+        // Uncomment here to add a new TA or Admin
+        // This will add false users, for checking users in the arraylist. (NECESSARY)
+        new Student("falseStudent", "False Student", Long.valueOf("123456789"), userList);
+        new TeachingAssistant("falseTA", "False TA", Long.valueOf("123456789"), userList);
+        new Admin("falseAdmin", "False Admin", userList);
+
+        // Add testStudent
+        new Student("akuStudent", "Aku Student", Long.valueOf("123456789"), userList);
+
+        // Add testTa with a mock calendar and schedule
+        TeachingAssistant testTa = new TeachingAssistant("akuTA", "Aku Asdos", Long.valueOf("123456789"), userList);
+        testTa.setSchedule("monday", "Free", "12:00", "17:00");
+        testTa.setSchedule("tuesday", "Free", "08:00", "11:00");
+        testTa.setSchedule("tuesday", "Free", "12:00", "15:00");
+        testTa.setSchedule("saturday", "Busy", "07:00", "21:00");
+        testTa.setSchedule("sunday", "Free", "12:00", "17:00");
+        new TeachingAssistant("anotherTA", "Another TA", Long.valueOf("1"), userList);
+
+        // Add testAdmin
+        new Admin("akuAdmin", "Aku Admin", userList);
+
+        // Add false course
+        new Course("False Course", "FALSECOURSE", "False Professor", 0, courseList);
+
+        // Add mock courses
+        new Course("Mata Kuliah", "MATKUL420", "Aku Dosen", 4, courseList);
+        new Course("Software Engineering", "SOFTENG2021", "Aku Professor", 3, courseList);
+        new Course("Fisika", "PHYS101", "Aku Dosen Fisika", 4, courseList);
+
+        // Save the course
+        ListIO.saveList(courseList, userList);
+
+        // ---------------- END OF "HARDCODED" VERSION
+
+        while (true) {
+
+            // PRODUCTION BUILD: Open all persistent storage
+            courseList = ListIO.openCourseList();
+            userList = ListIO.openUserList();
+
+            intro();
+            q = sc.nextLine();
+
+            // EXITS THE PROGRAM AND SERIALIZE ALL LIST, IF USER COMMAND IS "EXIT"
+            if (q.equals("EXIT")) {
+                System.out.println("Thank you for using our program! Have a good day!");
+                ListIO.saveList(courseList, userList);
+                break;
+            }
+
+            // TODO: Maybe it is better to move this whole if block into a different class
+            String[] splited = {" ", " "};
+            splited = q.split("\\s+");  // Split by space
+            String searchUsername;
+
+            // Exception handling if user does not provide a correct username
+            try {
+                searchUsername = splited[1];
+            } catch (Exception ex) {
+                searchUsername = "false";
+            }
+
+            String role = splited[0];
+
+            currentLogin = role;
+
+            switch (currentLogin) {
+                case "S":
+                    // Find student in userList. If not exist, immediately log out
+                    Student currentStudent = userList.searchStudent(searchUsername);
+                    if (currentStudent.getUsername().equals("falseStudent")) {
+                        q = "LOG OUT";
+                        System.out.println("Wrong username!");
+                    } else
+                        // If we reach here, that means we found the user, and we are now logged in.
+                        StudentCLI.main(new String[]{searchUsername});
+                    break;
+
+                case "T":
+                    // Find teaching assistant in userList. If not exist, immediately log out
+                    TeachingAssistant currentTA = userList.searchTA(searchUsername);
+                    if (currentTA.getUsername().equals("falseTA")) {
+                        q = "LOG OUT";
+                        System.out.println("Wrong username!");
+                    } else
+                        // If we reach here, that means we found the user, and we are now logged in.
+                        TACLI.main(new String[]{searchUsername});
+                    break;
+
+                case "A":
+                    // Find Admin in userList. If not exist, immediately log out
+                    Admin currentAdmin = userList.searchAdmin(searchUsername);
+                    if (currentAdmin.getUsername().equals("falseAdmin")) {
+                        q = "LOG OUT";
+                        System.out.println("Wrong username!");
+                    } else
+                        // If we reach here, that means we found the user, and we are now logged in.
+                        AdminCLI.main(new String[]{searchUsername});
+                    break;
+
+                case "REGISTER":
+                    System.out.println("(S)tudent / (T)eaching Assistant / (A)dmin?");
+                    String newUsername;
+                    String newFullname;
+                    Long newNPM;
+                    switch (sc.nextLine()) {
+                        case "S":
+                            System.out.println("Enter your username:");
+                            newUsername = sc.nextLine();
+                            System.out.println("Enter your full name:");
+                            newFullname = sc.nextLine();
+                            System.out.println("Enter your NPM:");
+                            newNPM = Long.parseLong(sc.nextLine());
+                            new Student(newUsername, newFullname, newNPM, userList);
+                            System.out.println("Successfully registered " + newUsername + " as a Student!");