diff --git a/joj3_config_generator/models/result.py b/joj3_config_generator/models/result.py index 21d9356..dd95c74 100644 --- a/joj3_config_generator/models/result.py +++ b/joj3_config_generator/models/result.py @@ -167,10 +167,6 @@ class Stage(BaseModel): class Config(BaseModel): name: str = "" log_path: str = Field("", serialization_alias="logPath") - expire_unix_timestamp: int = Field(-1, serialization_alias="expireUnixTimestamp") - effective_unix_timestamp: int = Field( - -1, serialization_alias="effectiveUnixTimestamp" - ) actor_csv_path: str = Field("", serialization_alias="actorCsvPath") max_total_score: int = Field(100, serialization_alias="maxTotalScore") stage: Stage diff --git a/tests/convert/basic/task.json b/tests/convert/basic/task.json index 864f918..9fd830e 100644 --- a/tests/convert/basic/task.json +++ b/tests/convert/basic/task.json @@ -1,8 +1,6 @@ { "name": "hw7 ex2", "logPath": "/home/tt/.cache/joj3/hw7/joj3.log", - "expireUnixTimestamp": 0, - "effectiveUnixTimestamp": 0, "actorCsvPath": "/home/tt/.config/joj/students.csv", "maxTotalScore": 10245871, "stage": { diff --git a/tests/convert/basic/task.toml b/tests/convert/basic/task.toml index e54dbef..abe7a65 100644 --- a/tests/convert/basic/task.toml +++ b/tests/convert/basic/task.toml @@ -1,5 +1,5 @@ # general task configuration -task.name = "hw7 ex2" # task name +name = "hw7 ex2" # task name max-total-score = 10245871 time.end = 2024-12-30 23:59:59+08:00 diff --git a/tests/convert/clang-tidy/task.json b/tests/convert/clang-tidy/task.json index 4450085..628ebc5 100644 --- a/tests/convert/clang-tidy/task.json +++ b/tests/convert/clang-tidy/task.json @@ -1,8 +1,6 @@ { "name": "hw7 ex2", "logPath": "/home/tt/.cache/joj3/hw7/joj3.log", - "expireUnixTimestamp": 0, - "effectiveUnixTimestamp": 0, "actorCsvPath": "/home/tt/.config/joj/students.csv", "maxTotalScore": 100, "stage": { diff --git a/tests/convert/clang-tidy/task.toml b/tests/convert/clang-tidy/task.toml index 35a89ec..911d2c2 100644 --- a/tests/convert/clang-tidy/task.toml +++ b/tests/convert/clang-tidy/task.toml @@ -1,5 +1,5 @@ # general task configuration -task.name = "hw7 ex2" # task name +name = "hw7 ex2" # task name time.end = 2024-12-30 23:59:59+08:00 time.begin = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/cppcheck/task.json b/tests/convert/cppcheck/task.json index a7b2893..f09d5ca 100644 --- a/tests/convert/cppcheck/task.json +++ b/tests/convert/cppcheck/task.json @@ -1,8 +1,6 @@ { "name": "hw7 ex2", "logPath": "/home/tt/.cache/joj3/hw7/joj3.log", - "expireUnixTimestamp": 0, - "effectiveUnixTimestamp": 0, "actorCsvPath": "/home/tt/.config/joj/students.csv", "maxTotalScore": 100, "stage": { diff --git a/tests/convert/cppcheck/task.toml b/tests/convert/cppcheck/task.toml index 80474d9..6f88ea3 100644 --- a/tests/convert/cppcheck/task.toml +++ b/tests/convert/cppcheck/task.toml @@ -1,5 +1,5 @@ # general task configuration -task.name = "hw7 ex2" # task name +name = "hw7 ex2" # task name time.end = 2024-12-30 23:59:59+08:00 time.begin = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/cpplint/task.json b/tests/convert/cpplint/task.json index df13ac6..8bbc948 100644 --- a/tests/convert/cpplint/task.json +++ b/tests/convert/cpplint/task.json @@ -1,8 +1,6 @@ { "name": "hw7 ex2", "logPath": "/home/tt/.cache/joj3/hw7/joj3.log", - "expireUnixTimestamp": 0, - "effectiveUnixTimestamp": 0, "actorCsvPath": "/home/tt/.config/joj/students.csv", "maxTotalScore": 100, "stage": { diff --git a/tests/convert/cpplint/task.toml b/tests/convert/cpplint/task.toml index 6896049..22945fd 100644 --- a/tests/convert/cpplint/task.toml +++ b/tests/convert/cpplint/task.toml @@ -1,5 +1,5 @@ # general task configuration -task.name = "hw7 ex2" # task name +name = "hw7 ex2" # task name time.end = 2024-12-30 23:59:59+08:00 time.begin = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/diff/task.json b/tests/convert/diff/task.json index 07345ce..9688e5b 100644 --- a/tests/convert/diff/task.json +++ b/tests/convert/diff/task.json @@ -1,8 +1,6 @@ { "name": "hw7 ex2", "logPath": "/home/tt/.cache/joj3/hw7/joj3.log", - "expireUnixTimestamp": 0, - "effectiveUnixTimestamp": 0, "actorCsvPath": "/home/tt/.config/joj/students.csv", "maxTotalScore": 100, "stage": { diff --git a/tests/convert/diff/task.toml b/tests/convert/diff/task.toml index 11aa5d1..94e3314 100644 --- a/tests/convert/diff/task.toml +++ b/tests/convert/diff/task.toml @@ -1,5 +1,5 @@ # general task configuration -task.name = "hw7 ex2" # task name +name = "hw7 ex2" # task name time.end = 2024-12-30 23:59:59+08:00 time.begin = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/elf/task.json b/tests/convert/elf/task.json index 986ffb2..af459ab 100644 --- a/tests/convert/elf/task.json +++ b/tests/convert/elf/task.json @@ -1,8 +1,6 @@ { "name": "hw7 ex2", "logPath": "/home/tt/.cache/joj3/hw7/joj3.log", - "expireUnixTimestamp": 0, - "effectiveUnixTimestamp": 0, "actorCsvPath": "/home/tt/.config/joj/students.csv", "maxTotalScore": 100, "stage": { diff --git a/tests/convert/elf/task.toml b/tests/convert/elf/task.toml index 5ba5607..20a536f 100644 --- a/tests/convert/elf/task.toml +++ b/tests/convert/elf/task.toml @@ -1,5 +1,5 @@ # general task configuration -task.name = "hw7 ex2" # task name +name = "hw7 ex2" # task name time.end = 2024-12-30 23:59:59+08:00 time.begin = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/empty/task.json b/tests/convert/empty/task.json index 4424c32..7d478d0 100644 --- a/tests/convert/empty/task.json +++ b/tests/convert/empty/task.json @@ -1,8 +1,6 @@ { "name": "health check", "logPath": "/home/tt/.cache/joj3/health/joj3.log", - "expireUnixTimestamp": 0, - "effectiveUnixTimestamp": 0, "actorCsvPath": "/home/tt/.config/joj/students.csv", "maxTotalScore": 100, "stage": { diff --git a/tests/convert/full/task.json b/tests/convert/full/task.json index 2903715..18d41cf 100644 --- a/tests/convert/full/task.json +++ b/tests/convert/full/task.json @@ -1,8 +1,6 @@ { "name": "hw7 ex3", "logPath": "/home/tt/.cache/joj3/hw7/joj3.log", - "expireUnixTimestamp": 0, - "effectiveUnixTimestamp": 0, "actorCsvPath": "/home/tt/.config/joj/students.csv", "maxTotalScore": 100, "stage": { diff --git a/tests/convert/keyword/task.json b/tests/convert/keyword/task.json index ccd3678..0291136 100644 --- a/tests/convert/keyword/task.json +++ b/tests/convert/keyword/task.json @@ -1,8 +1,6 @@ { "name": "hw7 ex2", "logPath": "/home/tt/.cache/joj3/hw7/joj3.log", - "expireUnixTimestamp": 0, - "effectiveUnixTimestamp": 0, "actorCsvPath": "/home/tt/.config/joj/students.csv", "maxTotalScore": 100, "stage": { diff --git a/tests/convert/keyword/task.toml b/tests/convert/keyword/task.toml index 7e166ad..2385e76 100644 --- a/tests/convert/keyword/task.toml +++ b/tests/convert/keyword/task.toml @@ -1,5 +1,5 @@ # general task configuration -task.name = "hw7 ex2" # task name +name = "hw7 ex2" # task name time.end = 2024-12-30 23:59:59+08:00 time.begin = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/result-detail/task.json b/tests/convert/result-detail/task.json index 2f222a0..4846b19 100644 --- a/tests/convert/result-detail/task.json +++ b/tests/convert/result-detail/task.json @@ -1,8 +1,6 @@ { "name": "hw7 ex2", "logPath": "/home/tt/.cache/joj3/hw7/joj3.log", - "expireUnixTimestamp": 0, - "effectiveUnixTimestamp": 0, "actorCsvPath": "/home/tt/.config/joj/students.csv", "maxTotalScore": 100, "stage": { diff --git a/tests/convert/result-detail/task.toml b/tests/convert/result-detail/task.toml index 243904f..c2b3e88 100644 --- a/tests/convert/result-detail/task.toml +++ b/tests/convert/result-detail/task.toml @@ -1,5 +1,5 @@ # general task configuration -task.name = "hw7 ex2" # task name +name = "hw7 ex2" # task name time.end = 2024-12-30 23:59:59+08:00 time.begin = 2024-12-29 23:59:59+08:00 diff --git a/tests/convert/unnecessary/task.json b/tests/convert/unnecessary/task.json index 79dd4be..242e797 100644 --- a/tests/convert/unnecessary/task.json +++ b/tests/convert/unnecessary/task.json @@ -1,8 +1,6 @@ { "name": "hw7 ex2", "logPath": "/home/tt/.cache/joj3/hw7/joj3.log", - "expireUnixTimestamp": 0, - "effectiveUnixTimestamp": 0, "actorCsvPath": "/home/tt/.config/joj/students.csv", "maxTotalScore": 100, "stage": { diff --git a/tests/convert/unnecessary/task.toml b/tests/convert/unnecessary/task.toml index 48db423..42a40b2 100644 --- a/tests/convert/unnecessary/task.toml +++ b/tests/convert/unnecessary/task.toml @@ -1,5 +1,5 @@ # general task configuration -task.name = "hw7 ex2" # task name +name = "hw7 ex2" # task name [[stages]] name = "[cq] Filelength"