feat-issueresolve-1

backend-app/file/file_tests/services_test.py

@@ -12,6 +12,7 @@
 from project.models import Project
 from user.models import CustomUser
 from uuid import uuid4
+from datetime import datetime as dt, timedelta as td
 
 
 class ViewServicesTest(TestCase, ViewSetServices):
@@ -199,6 +200,12 @@ def test_form_query(self):
         query["author"] = self.admin
         self._form_query_mixin(query)
 
+        query["from_"] = dt.now().strftime("%Y-%m-%d")
+        self._form_query_mixin(query)
+
+        query["to"] = (dt.now() + td(days=1)).strftime("%Y-%m-%d")
+        self._form_query_mixin(query)
+
     def _form_query_mixin(self, data={}):
         query, filter = self._get_query(**data)
         res = self._form_query(
@@ -215,7 +222,9 @@ def _get_query(
         status="",
         downloaded=False,
         author=[],
-        user=None
+        user=None,
+        from_="",
+        to=""
     ):
         request_query = type(
             "query",

backend-app/file/services.py

@@ -9,11 +9,13 @@
 from rest_framework.views import Request
 from django.db import connection
 from django.db.models import Count, Subquery, QuerySet
+from django.utils import timezone as tz
 from attribute.models import Level, AttributeGroup as AGroup
 from user.models import CustomUser
 from json import loads
 from typing import Any
 from uuid import UUID
+from datetime import datetime as dt
 from .serializers import File, FileSerializer
 
 
@@ -28,7 +30,9 @@ class ViewSetServices:
         ("file_type__in", "type[]", True),
         ("status", "status", False),
         ("is_downloaded", "downloaded", False),
-        ("author__in", "author[]", True)
+        ("author__in", "author[]", True),
+        ("upload_date__gte", "from", False),
+        ("upload_date__lte", "to", False)
     )
 
     def _patch_file(
@@ -87,13 +91,19 @@ def _form_query(
                 else request_query.get(param)
             )
 
-            if query_param: query[filter_name] = (
-                False if filter_name == "is_downloaded"
-                else query_param
-            )
+            if query_param:
+                query[filter_name] = self._get_param(filter_name, query_param)
 
         return query
 
+    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
+
     def _get_files(
         self,
         project_id: int,

frontend-app/src/app.css

@@ -13,7 +13,7 @@
     /* --issLightGreen: #99ff62; */
     /* --issBrand: #004077; */
     /* --issLightBrand: #01a4e0; */
-    --maxWidth: 1320px;
+    --maxWidth: 1920px;
 }
 
 * {

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

@@ -53,15 +53,23 @@ export default function FilesValidation({ pathID, attributes, canValidate }) {
 
   function handleChange(filterType, query) {
     var { card, attr, type, author, date } = getPageQuery();
-
-    setPageQuery({
+    var preparedQuery = {
       'card[]': filterType === 'card' ? query : card,
       'attr[]': filterType === 'attr' ? query : attr,
       'type[]': filterType === 'type' ? query : type,
       'author[]': filterType === 'author' ? query : author,
-      "date_from": filterType === "date" ? query.from : date.from,
-      "date_to": filterType === "date" ? query.to : date.to,
-    });
+    };
+
+    if (filterType === "date" || date?.from) {
+      let value = filterType === "date" ? query?.from : date?.from;
+      if (value) preparedQuery.date_from = value;
+    }
+    if (filterType === "date" || date?.to) {
+      let value = filterType === "date" ? query?.to : date?.to;
+      if (value) preparedQuery.date_to = value;
+    }
+
+    setPageQuery(preparedQuery);
   }
 
   useEffect(() => {
@@ -72,7 +80,7 @@ export default function FilesValidation({ pathID, attributes, canValidate }) {
     // TODO: query collectors depend on uploads to project by users
     Promise.allSettled([
       api.get(`/api/files/project/${pathID}/`, {
-        params: { card, attr, type, author },
+        params: { card, attr, type, author, from: date?.from, to: date?.to },
         headers: { "Authorization": "Bearer " + localStorage.getItem("dtcAccess") }
       }),
       canValidate && api.get(`api/users/collectors/${pathID}/`, {

frontend-app/src/components/forms/ValidationFilterGroup/component.test.js

@@ -3,8 +3,9 @@ import ValidationFilterGroup from '.';
 
 test("validation filter group form component test", () => {
   const filterData = [
-    { prettryName: "sel1", name: "sel1name", selected: [], attributes: true, data: [] },
-    { prettryName: "sel2", name: "sek2name", selected: [],  data: [] },
+    { prettryName: "sel1", name: "sel1name", selected: [], type: "attr", data: [] },
+    { prettryName: "sel2", name: "sel2name", selected: [], type: "date", data: [] },
+    { prettryName: "sel3", name: "sek3name", selected: [],  data: [] },
   ];
   var changed = false;
   const { container } = render(
@@ -16,6 +17,7 @@ test("validation filter group form component test", () => {
 
   expect(container.querySelectorAll(".iss__filterSelector")).toHaveLength(1);
   expect(container.querySelectorAll(".iss__manualSelector")).toHaveLength(1);
+  expect(container.querySelectorAll(".iss__dateSelector")).toHaveLength(1);
   expect(changed).toBeFalsy();
   fireEvent.click(
     container.querySelector(".iss__filterSelector")

frontend-app/src/components/ui/DateSelector/component.test.js

@@ -1,3 +1,37 @@
-import { fireEvent, act, render, renderHook, screen } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
+import DateSelector from '.';
 
-test("date selector test", () => {});
+test("date selector test", () => {
+  const containerClass = ".iss__dateSelector__options";
+  const parentClass = ".iss__dateSelector__selected";
+
+  const toggler = () => {
+    var opened = false;
+    return (set) => {
+      if (set) return opened = !opened;
+      var className = containerClass.slice(1);
+      fireEvent.click(container.querySelector(parentClass));
+      opened = !opened;
+      if (opened) className += " options--open";
+      expect(container.querySelector(containerClass).className).toBe(className);
+      return opened;
+    };
+  };
+
+  const { container } = render(
+    <DateSelector onChange={(e) => e} defaultSelected={{}} />
+  );
+
+  var toggle = toggler();
+
+  screen.getByText("clear dates");
+  expect(toggle()).toBeTruthy();
+  expect(toggle()).toBeFalsy();
+  expect(toggle()).toBeTruthy();
+  expect(container.querySelector(".off--title")).not.toBeNull();
+
+  fireEvent.click(screen.getByRole("button"));
+  toggle(true);
+
+  expect(container.querySelector(containerClass).className).toBe(containerClass.slice(1));
+});

frontend-app/src/components/ui/DateSelector/index.jsx

@@ -7,10 +7,7 @@ import './styles.css';
 * @param {{ from: string, to: string }} [props.defaultSelected]
 * @returns {ReactElement}
 */
-export default function DateSelector({
-  onChange,
-  defaultSelected,
-}) {
+export default function DateSelector({ onChange, defaultSelected }) {
   const [isOpen, setIsOpen] = useState(false);
   const [from, setFrom] = useState("");
   const [to, setTo] = useState("");