From 5444debb928b6f06776c4f042d88ce25bf61d7aa Mon Sep 17 00:00:00 2001
From: Boming Zhang <bomingzh@sjtu.edu.cn>
Date: Sun, 2 Mar 2025 14:31:03 -0500
Subject: [PATCH] feat: better release time default

---
 joj3_config_generator/convert.py     | 15 +++------------
 joj3_config_generator/models/task.py | 10 +++++++---
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/joj3_config_generator/convert.py b/joj3_config_generator/convert.py
index c9dd28a..f388469 100644
--- a/joj3_config_generator/convert.py
+++ b/joj3_config_generator/convert.py
@@ -1,5 +1,4 @@
 import os
-from datetime import datetime
 from pathlib import Path
 from typing import List
 
@@ -26,16 +25,8 @@ def convert(repo_conf: repo.Config, task_conf: task.Config) -> result.Config:
         name=task_conf.task.name,
         # exact folder difference specified by type
         log_path=f"/home/tt/.cache/joj3/{task_conf.task.type_}.log",
-        expire_unix_timestamp=(
-            int(task_conf.release.end_time.timestamp())
-            if task_conf.release.end_time
-            else -1
-        ),
-        effective_unix_timestamp=(
-            int(task_conf.release.begin_time.timestamp())
-            if task_conf.release.begin_time
-            else -1
-        ),
+        expire_unix_timestamp=int(task_conf.release.end_time.timestamp()),
+        effective_unix_timestamp=int(task_conf.release.begin_time.timestamp()),
         actor_csv_path="/home/tt/.config/joj/students.csv",  # students.csv position
         max_total_score=repo_conf.max_total_score,
         stage=result.Stage(
@@ -74,6 +65,6 @@ def convert_joj1(joj1_conf: joj1.Config) -> task.Config:
         task=task.Task(
             name=(""),
         ),
-        release=task.Release(end_time=datetime.now(), begin_time=datetime.now()),
+        release=task.Release(),
         stages=stages,
     )
diff --git a/joj3_config_generator/models/task.py b/joj3_config_generator/models/task.py
index c80ad82..8408fda 100644
--- a/joj3_config_generator/models/task.py
+++ b/joj3_config_generator/models/task.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from pathlib import Path
 from typing import Any, Dict, List, Type
 
@@ -113,8 +113,12 @@ class Stage(BaseModel):
 
 
 class Release(BaseModel):
-    end_time: datetime = datetime.now()  # RFC 3339 formatted date-time with offset
-    begin_time: datetime = datetime.now()  # RFC 3339 formatted date-time with offset
+    end_time: datetime = datetime.now() + timedelta(
+        days=365
+    )  # RFC 3339 formatted date-time with offset
+    begin_time: datetime = datetime.fromtimestamp(
+        0
+    )  # RFC 3339 formatted date-time with offset
 
 
 class Task(BaseModel):