Merge pull request #179 from upb-uc4/bugfix/exam_prerelease_timestamp_admission

Bugfix/exam prerelease timestamp admission

Author: NikoBergemann

UC4-chaincode/src/main/java/de/upb/cs/uc4/chaincode/contract/admission/AdmissionContract.java

@@ -16,6 +16,7 @@
 import org.hyperledger.fabric.shim.ChaincodeStub;
 
 import java.lang.reflect.Type;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -42,6 +43,7 @@ public class AdmissionContract extends ContractBase {
     @Transaction()
     public String addAdmission(final Context ctx, String admissionJson) {
         String transactionName = HyperledgerManager.getTransactionName(ctx.getStub());
+        String timeStamp = cUtil.getTimestamp(ctx.getStub());
         final String[] args = new String[]{admissionJson};
         try {
             cUtil.checkParamsAddAdmission(ctx, args);
@@ -51,6 +53,7 @@ public String addAdmission(final Context ctx, String admissionJson) {
 
         ChaincodeStub stub = ctx.getStub();
         AbstractAdmission newAdmission = GsonWrapper.fromJson(admissionJson, AbstractAdmission.class);
+        newAdmission.setTimestamp(LocalDateTime.parse(timeStamp));
         newAdmission.resetAdmissionId();
 
         try {

UC4-chaincode/src/main/java/de/upb/cs/uc4/chaincode/model/admission/AbstractAdmission.java

@@ -112,9 +112,6 @@ public ArrayList<InvalidParameter> getParameterErrors() {
         if (cUtil.valueUnset(this.enrollmentId)) {
             invalidParams.add(cUtil.getEmptyEnrollmentIdParam(cUtil.getErrorPrefix() + "."));
         }
-        if (cUtil.valueUnset(this.timestamp)) {
-            invalidParams.add(cUtil.getInvalidTimestampParamLocalDateTime("timestamp"));
-        }
         if (cUtil.valueUnset(this.type)) {
             invalidParams.add(cUtil.getInvalidTypeParam());
         }

UC4-chaincode/src/test/resources/test_configs/admission_contract/AddAdmissionTestIO.json

@@ -54,7 +54,7 @@
         "enrollmentId": "0000001",
         "courseId": "C.1",
         "moduleId": "M.1",
-        "timestamp": "2020-12-31T23:59:59",
+        "timestamp": "",
         "type": "Course"
       }
     ],
@@ -64,7 +64,7 @@
         "moduleId": "M.1",
         "admissionId": "0000001:C.1",
         "enrollmentId": "0000001",
-        "timestamp": "2020-12-31T23:59:59",
+        "timestamp": "1970-01-01T00:00:00",
         "type": "Course"
       }
     ]
@@ -101,7 +101,7 @@
         "examId": "ExampleCourse:M.1:WrittenExam:2021-02-16T10:00:00",
         "admissionId": "0000001:ExampleCourse:M.1:WrittenExam:2021-02-16T10:00:00",
         "enrollmentId": "0000001",
-        "timestamp": "2020-12-31T23:59:59",
+        "timestamp": "1970-01-01T00:00:00",
         "type": "Exam"
       }
     ]
@@ -397,132 +397,6 @@
       }
     ]
   },
-  {
-    "name": "addNonExistingAdmission_EmptyParam_Timestamp",
-    "type": "addAdmission_FAILURE",
-    "ids": [
-      "User1",
-      "0000005"
-    ],
-    "setup": {
-      "examinationRegulationContract": [
-        "Computer Science",
-        {
-          "name": "Computer Science",
-          "active": true,
-          "modules": [
-            {
-              "id": "M.1",
-              "name": "Math 1"
-            },
-            {
-              "id": "M.2",
-              "name": "Math 2"
-            }
-          ]
-        }
-      ],
-      "matriculationDataContract": [
-        "0000005",
-        {
-          "enrollmentId": "0000005",
-          "matriculationStatus": [
-            {
-              "fieldOfStudy": "Computer Science",
-              "semesters": [
-                "WS2018/19"
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    "input": [
-      {
-        "admissionId": "",
-        "enrollmentId": "0000005",
-        "courseId": "C.1",
-        "moduleId": "M.1",
-        "timestamp": "",
-        "type": "Course"
-      }
-    ],
-    "compare": [
-      {
-        "type": "HLUnprocessableEntity",
-        "title": "The following parameters do not conform to the specified format",
-        "invalidParams": [
-          {
-            "name": "admission.timestamp",
-            "reason": "timestamp must be the following format \"(\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\", e.g. \"2020-12-31T23:59:59\""
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "addNonExistingAdmission_WrongFormatParam_Timestamp",
-    "type": "addAdmission_FAILURE",
-    "ids": [
-      "User1",
-      "0000006"
-    ],
-    "setup": {
-      "examinationRegulationContract": [
-        "Computer Science",
-        {
-          "name": "Computer Science",
-          "active": true,
-          "modules": [
-            {
-              "id": "M.1",
-              "name": "Math 1"
-            },
-            {
-              "id": "M.2",
-              "name": "Math 2"
-            }
-          ]
-        }
-      ],
-      "matriculationDataContract": [
-        "0000006",
-        {
-          "enrollmentId": "0000006",
-          "matriculationStatus": [
-            {
-              "fieldOfStudy": "Computer Science",
-              "semesters": [
-                "WS2018/19"
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    "input": [
-      {
-        "admissionId": "",
-        "enrollmentId": "0000006",
-        "courseId": "C.1",
-        "moduleId": "M.1",
-        "timestamp": "2020-12-31-23:59:59",
-        "type": "Course"
-      }
-    ],
-    "compare": [
-      {
-        "type": "HLUnprocessableEntity",
-        "title": "The following parameters do not conform to the specified format",
-        "invalidParams": [
-          {
-            "name": "admission.timestamp",
-            "reason": "timestamp must be the following format \"(\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\", e.g. \"2020-12-31T23:59:59\""
-          }
-        ]
-      }
-    ]
-  },
   {
     "name": "addNonExistingAdmission_InvalidModules",
     "type": "addAdmission_FAILURE",