refactor arch table/services, file/arch models

Author: githubering182

backend-app/archive/serializers.py

@@ -1,4 +1,4 @@
-from rest_framework.serializers import ModelSerializer, ChoiceField, SerializerMethodField
+from rest_framework.serializers import ModelSerializer, ChoiceField, SerializerMethodField, IntegerField
 from .models import Archive
 
 
@@ -9,6 +9,7 @@ def to_representation(self, value: str) -> str: return self.choices[value]
 class ArchiveSerializer(ModelSerializer):
     status = StatusChoiceField(choices=Archive.STATUSES)
     author = SerializerMethodField()
+    file_count = IntegerField()
 
     class Meta:
         model = Archive

backend-app/archive/services.py

@@ -20,7 +20,7 @@
 def _get_archives(project: Project) -> tuple[dict[str, Any], int]:
     query = project.archive_set \
         .annotate(file_count=Count("file")) \
-        .order_by("create_date")
+        .order_by("-create_date")
     return ArchiveSerializer(query, many=True).data, HTTP_200_OK
 
 
@@ -41,14 +41,17 @@ def _make_archive(project: Project, request: Request) -> tuple[dict[str, Any], i
         .values("name") \
         .values_list("name", flat=True)
 
+    only_new = request_query.get("only_new", False)
+
     filter_data = {
         "status": request_query.get("card", []),
-        "only_new": request_query.get("downloaded", False),
+        "only_new": only_new,
         "type": request_query.get("type", []),
         "attributes": list(attributes)
     }
 
     files, _ = FileService()._get_files(project.id, request.user, request_query, True)
+    if only_new: files = files.filter(archive__isnull=True)
 
     # response = post(
     #     "url",
@@ -71,7 +74,6 @@ def _make_archive(project: Project, request: Request) -> tuple[dict[str, Any], i
             author=request.user
         )
 
-        files.update(is_downloaded=True)
         archive.file.add(*files)
 
     return ArchiveSerializer(archive).data, 201

backend-app/file/file_tests/models_test.py

@@ -36,7 +36,6 @@ def test_create_file(self):
                     "project",
                     "author",
                     "status",
-                    "is_downloaded",
                     "validator",
                 )
                 .get(id=new_file.id)

backend-app/file/file_tests/serializers_test.py

@@ -27,7 +27,6 @@ def test_file_serializer(self):
             'file_name',
             'file_type',
             'status',
-            'is_downloaded',
         }
 
         self.assertEqual(

backend-app/file/file_tests/services_test.py

@@ -295,7 +295,6 @@ def _get_query(
             filter["status"] = status
         if downloaded:
             query.set("downloaded", downloaded)
-            filter["is_downloaded"] = False
         if author:
             query.set("author[]", author)
             filter["author__in"] = author

backend-app/file/file_tests/views_test.py

@@ -278,10 +278,7 @@ def test_annotate_files(self):
             content_type="application/json",
             HTTP_AUTHORIZATION="Bearer " + self.case.user.emit_token()
         )
-        self.assertEqual(
-            self.case.project.file_set.filter(is_downloaded=True).count(),
-            0
-        )
+
 
         admin_request = self.client.post(
             "/api/files/annotation/",
@@ -311,7 +308,3 @@ def test_annotate_files(self):
         )
         self.assertEqual(internal_request.status_code, 202)
         self.assertEqual(internal_request.data["annotated"], 1)
-        self.assertEqual(
-            self.case.project.file_set.filter(is_downloaded=True).count(),
-            1
-        )

backend-app/file/models.py

@@ -24,7 +24,6 @@ class File(Model):
     file_name: CharField = CharField(max_length=255)
     file_type: CharField = CharField(max_length=10)
     status: CharField = CharField(max_length=1, choices=STATUSES, default='p')
-    is_downloaded: BooleanField = BooleanField(default=False)
     upload_date: DateTimeField = DateTimeField(auto_now_add=True)
     update_date: DateTimeField = DateTimeField(auto_now_add=True, null=True)
 

backend-app/file/services.py

@@ -15,6 +15,7 @@
     Case,
     Prefetch
 )
+from django.db.models.query import QuerySet
 from rest_framework.request import QueryDict
 from rest_framework.views import Request
 from django.db import connection, transaction
@@ -35,7 +36,6 @@ class ViewSetServices:
         ("status__in", "card[]", True),
         ("file_type__in", "type[]", True),
         ("status", "status", False),
-        ("is_downloaded", "downloaded", False),
         ("author__in", "author[]", True),
         ("upload_date__gte", "from", False),
         ("upload_date__lte", "to", False)
@@ -116,7 +116,6 @@ def _get_param(self, filter_name: str, query_param: Any) -> Any:
         date_from_str = lambda d: tz.make_aware(dt.strptime(d, "%Y-%m-%d"))
 
         match filter_name:
-            case "is_downloaded": return False
             case "upload_date__gte": return date_from_str(query_param)
             case "upload_date__lte": return date_from_str(query_param)
             case _: return query_param
@@ -127,7 +126,7 @@ def _get_files(
         request_user: CustomUser,
         request_query: QueryDict,
         as_query: bool = False
-    ) -> tuple[dict[str, Any], int]:
+    ) -> tuple[dict[str, Any] | QuerySet, int]:
         filters = self._form_filters(project_id, request_user, request_query)
         orders = self._form_orders(request_query)
 

frontend-app/src/components/FilesDownload/DownloadTable.jsx

@@ -15,6 +15,7 @@ export default function DownloadTable({ data, onDownload }) {
         <th>author</th>
         <th>status</th>
         <th>create date</th>
+        <th>file count</th>
         <th>result size</th>
         <th>result message</th>
         <th>requested</th>
@@ -24,21 +25,25 @@ export default function DownloadTable({ data, onDownload }) {
     <tbody>
       {
         data.map((item) => (
-          <tr key={item.id}>
+          <tr key={item.id} className={"downloads__row__" + item.status.toLowerCase()}>
             <td>{item.id}</td>
             <td>{item.author}</td>
             <td>{item.status.toLowerCase()}</td>
             <td>{item.create_date}</td>
+            <td>{item.file_count}</td>
             <td>{item.result_size}</td>
             <td>{item.result_message}</td>
             <td>{formatFilterJSON(item.filters)}</td>
-            <td onClick={() => onDownload(item.id)} className="downloads__table__button">
-              <button type="button">
-                <svg width="24" height="24" viewBox="0 0 24 24">
-                  <path d="M14.14 13H13V3a1 1 0 0 0-2 0v10H9.86a1 1 0 0 0-.69 1.5l2.14 3.12a.82.82 0 0 0 1.38 0l2.14-3.12a1 1 0 0 0-.69-1.5" />
-                  <path d="M19 22H5a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2h3a1 1 0 0 1 0 2H5v11h14V9h-3a1 1 0 0 1 0-2h3a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2" />
-                </svg>
-              </button>
+            <td className="downloads__table__button">
+              {
+                item.status === "SUCCESS" &&
+                <button type="button" onClick={() => onDownload(item.result_id)}>
+                  <svg width="24" height="24" viewBox="0 0 24 24">
+                    <path d="M14.14 13H13V3a1 1 0 0 0-2 0v10H9.86a1 1 0 0 0-.69 1.5l2.14 3.12a.82.82 0 0 0 1.38 0l2.14-3.12a1 1 0 0 0-.69-1.5" />
+                    <path d="M19 22H5a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2h3a1 1 0 0 1 0 2H5v11h14V9h-3a1 1 0 0 1 0-2h3a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2" />
+                  </svg>
+                </button>
+              }
             </td>
           </tr>
         ))

frontend-app/src/components/FilesDownload/index.jsx

@@ -59,7 +59,7 @@ export default function FilesDownload({ pathID, attributes }) {
 
     try {
       var payload = { ...filterData };
-      if (newCheckBox.current.checked) payload.downloaded = false;
+      if (newCheckBox.current.checked) payload.only_new = true;
 
       await api.post(`/api/projects/archive/${pathID}/`, payload, {
         headers: { Authorization: "Bearer " + localStorage.getItem("dtcAccess") },
@@ -132,10 +132,8 @@ export default function FilesDownload({ pathID, attributes }) {
       >{loading ? <Load isInline /> : <span>request</span>}</button>
     </div>
     {
-      downloads.length
-      ? <DownloadTable data={downloads} onDownload={(id) => { console.log(id); }}/>
-      : "No Data"
+      downloads.length &&
+      <DownloadTable data={downloads} onDownload={(id) => { console.log(id); }}/>
     }
-
   </>;
 }