16th_fix

app/models/job.py

@@ -49,6 +49,7 @@ class TranslationJob(db.Model):
         onupdate=func.now(), 
         comment='更新時間'
     )
+    deleted_at = db.Column(db.DateTime, comment='軟刪除時間')
     
     # 關聯關係
     files = db.relationship('JobFile', backref='job', lazy='dynamic', cascade='all, delete-orphan')
@@ -84,7 +85,8 @@ class TranslationJob(db.Model):
             'processing_started_at': format_taiwan_time(self.processing_started_at, "%Y-%m-%d %H:%M:%S") if self.processing_started_at else None,
             'completed_at': format_taiwan_time(self.completed_at, "%Y-%m-%d %H:%M:%S") if self.completed_at else None,
             'created_at': format_taiwan_time(self.created_at, "%Y-%m-%d %H:%M:%S") if self.created_at else None,
-            'updated_at': format_taiwan_time(self.updated_at, "%Y-%m-%d %H:%M:%S") if self.updated_at else None
+            'updated_at': format_taiwan_time(self.updated_at, "%Y-%m-%d %H:%M:%S") if self.updated_at else None,
+            'deleted_at': format_taiwan_time(self.deleted_at, "%Y-%m-%d %H:%M:%S") if self.deleted_at else None
         }
         
         if include_files:
@@ -156,15 +158,32 @@ class TranslationJob(db.Model):
         self.updated_at = datetime.utcnow()
         db.session.commit()
     
+    def soft_delete(self):
+        """軟刪除任務（保留資料供報表使用）"""
+        self.deleted_at = datetime.utcnow()
+        self.updated_at = datetime.utcnow()
+        db.session.commit()
+    
+    def restore(self):
+        """恢復已刪除的任務"""
+        self.deleted_at = None
+        self.updated_at = datetime.utcnow()
+        db.session.commit()
+    
+    def is_deleted(self):
+        """檢查任務是否已被軟刪除"""
+        return self.deleted_at is not None
+    
     @classmethod
     def get_queue_position(cls, job_uuid):
         """取得任務在佇列中的位置"""
-        job = cls.query.filter_by(job_uuid=job_uuid).first()
+        job = cls.query.filter_by(job_uuid=job_uuid, deleted_at=None).first()
         if not job:
             return None
         
         position = cls.query.filter(
             cls.status == 'PENDING',
+            cls.deleted_at.is_(None),
             cls.created_at < job.created_at
         ).count()
         
@@ -173,18 +192,22 @@ class TranslationJob(db.Model):
     @classmethod
     def get_pending_jobs(cls):
         """取得所有等待處理的任務"""
-        return cls.query.filter_by(status='PENDING').order_by(cls.created_at.asc()).all()
+        return cls.query.filter_by(status='PENDING', deleted_at=None).order_by(cls.created_at.asc()).all()
     
     @classmethod
     def get_processing_jobs(cls):
         """取得所有處理中的任務"""
-        return cls.query.filter_by(status='PROCESSING').all()
+        return cls.query.filter_by(status='PROCESSING', deleted_at=None).all()
     
     @classmethod
-    def get_user_jobs(cls, user_id, status=None, limit=None, offset=None):
+    def get_user_jobs(cls, user_id, status=None, limit=None, offset=None, include_deleted=False):
         """取得使用者的任務列表"""
         query = cls.query.filter_by(user_id=user_id)
         
+        # 預設排除軟刪除的記錄，除非明確要求包含
+        if not include_deleted:
+            query = query.filter(cls.deleted_at.is_(None))
+        
         if status and status != 'all':
             query = query.filter_by(status=status.upper())
         
@@ -198,10 +221,14 @@ class TranslationJob(db.Model):
         return query.all()
     
     @classmethod
-    def get_statistics(cls, user_id=None, start_date=None, end_date=None):
-        """取得統計資料"""
+    def get_statistics(cls, user_id=None, start_date=None, end_date=None, include_deleted=True):
+        """取得統計資料（預設包含所有記錄以確保報表完整性）"""
         query = cls.query
         
+        # 報表統計預設包含已刪除記錄以確保數據完整性
+        if not include_deleted:
+            query = query.filter(cls.deleted_at.is_(None))
+        
         if user_id:
             query = query.filter_by(user_id=user_id)