From 669bef95289889aac6c809d2fedc0119b78d6a94 Mon Sep 17 00:00:00 2001
From: TannedCung <dx.tan@samsung.com>
Date: Tue, 5 Nov 2024 09:56:30 +0700
Subject: [PATCH 01/13] Add migrations

---
 ...subscriptionrequest_request_id_and_more.py | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 cope2n-api/fwd_api/migrations/0195_alter_subscriptionrequest_request_id_and_more.py

diff --git a/cope2n-api/fwd_api/migrations/0195_alter_subscriptionrequest_request_id_and_more.py b/cope2n-api/fwd_api/migrations/0195_alter_subscriptionrequest_request_id_and_more.py
new file mode 100644
index 0000000..175920c
--- /dev/null
+++ b/cope2n-api/fwd_api/migrations/0195_alter_subscriptionrequest_request_id_and_more.py
@@ -0,0 +1,31 @@
+# Generated by Django 4.1.3 on 2024-11-05 02:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fwd_api', '0194_alter_semiautocorrection_feedback_accuracy_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subscriptionrequest',
+            name='request_id',
+            field=models.CharField(db_index=True, max_length=200),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='id',
+            field=models.AutoField(db_index=True, primary_key=True, serialize=False),
+        ),
+        migrations.AddIndex(
+            model_name='subscriptionrequestfile',
+            index=models.Index(fields=['request', 'index_in_request', 'doc_type'], name='fwd_api_sub_request_890e13_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='subscriptionrequestfile',
+            index=models.Index(fields=['request', 'file_name'], name='fwd_api_sub_request_1a42cd_idx'),
+        ),
+    ]
\ No newline at end of file

From a282e9c5052a2ecdf0bce576db60dfaf5fd80a7a Mon Sep 17 00:00:00 2001
From: TannedCung <dx.tan@samsung.com>
Date: Thu, 28 Nov 2024 16:44:39 +0700
Subject: [PATCH 02/13] Add: filter to search

---
 cope2n-api/fwd_api/api/accuracy_view.py | 42 ++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/cope2n-api/fwd_api/api/accuracy_view.py b/cope2n-api/fwd_api/api/accuracy_view.py
index e4295f0..ec48e65 100755
--- a/cope2n-api/fwd_api/api/accuracy_view.py
+++ b/cope2n-api/fwd_api/api/accuracy_view.py
@@ -112,6 +112,34 @@ class AccuracyViewSet(viewsets.ViewSet):
                 type=OpenApiTypes.FLOAT,
                 required=False
             ),
+            OpenApiParameter(
+                name='predict_result',
+                location=OpenApiParameter.QUERY,
+                description='Filter by predict result',
+                type=OpenApiTypes.STR,
+                required=False
+            ),
+            OpenApiParameter(
+                name='feedback_result',
+                location=OpenApiParameter.QUERY,
+                description='Filter by feedback result',
+                type=OpenApiTypes.STR,
+                required=False
+            ),
+            OpenApiParameter(
+                name='reviewed_result',
+                location=OpenApiParameter.QUERY,
+                description='Filter by reviewed result',
+                type=OpenApiTypes.STR,
+                required=False
+            ),
+            OpenApiParameter(
+                name='doc_type',
+                location=OpenApiParameter.QUERY,
+                description='Filter by document type',
+                type=OpenApiTypes.STR,
+                required=False
+            ),
         ],
         responses=None, tags=['Accuracy']
     )
@@ -129,7 +157,10 @@ class AccuracyViewSet(viewsets.ViewSet):
             include_test = request.GET.get('includes_test', False)
             subsidiary = request.GET.get("subsidiary", "all")
             max_accuracy = float(request.GET.get("max_accuracy", 100))
-            # subsidiary = map_subsidiary_long_to_short(subsidiary)
+            predict_result = request.GET.get('predict_result', None)
+            feedback_result = request.GET.get('feedback_result', None)
+            reviewed_result = request.GET.get('reviewed_result', None)
+            doc_type = request.GET.get('doc_type', None)
 
             base_query = Q(status=200)
             if start_date_str or end_date_str:
@@ -193,6 +224,15 @@ class AccuracyViewSet(viewsets.ViewSet):
                         base_query &= Q(
                             redemption_id__startswith=map_subsidiary_long_to_short(subsidiary))
 
+            if predict_result:
+                base_query &= Q(predict_result__icontains=predict_result)
+            if feedback_result:
+                base_query &= Q(feedback_result__icontains=feedback_result)
+            if reviewed_result:
+                base_query &= Q(reviewed_result__icontains=reviewed_result)
+            if doc_type:
+                base_query &= Q(doc_type__icontains=doc_type)
+
             if isinstance(max_accuracy, float):
                 base_query &= Q(raw_accuracy__lt=(
                     max_accuracy/100)) | Q(raw_accuracy__isnull=True)

From 69ac10dec36a5d8fa1f7c6469f52b4918feba3ab Mon Sep 17 00:00:00 2001
From: TannedCung <dx.tan@samsung.com>
Date: Thu, 28 Nov 2024 16:45:06 +0700
Subject: [PATCH 03/13] Add: model index and migrations

---
 ...estfile_idx_gin_predict_result_and_more.py | 26 +++++++++++++++++++
 ...uest_idx_gin_rq_predict_result_and_more.py | 26 +++++++++++++++++++
 ...0198_alter_subscriptionrequest_doc_type.py | 18 +++++++++++++
 .../fwd_api/models/SubscriptionRequest.py     | 10 ++++++-
 .../fwd_api/models/SubscriptionRequestFile.py |  5 +++-
 5 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 cope2n-api/fwd_api/migrations/0196_subscriptionrequestfile_idx_gin_predict_result_and_more.py
 create mode 100644 cope2n-api/fwd_api/migrations/0197_subscriptionrequest_idx_gin_rq_predict_result_and_more.py
 create mode 100644 cope2n-api/fwd_api/migrations/0198_alter_subscriptionrequest_doc_type.py

diff --git a/cope2n-api/fwd_api/migrations/0196_subscriptionrequestfile_idx_gin_predict_result_and_more.py b/cope2n-api/fwd_api/migrations/0196_subscriptionrequestfile_idx_gin_predict_result_and_more.py
new file mode 100644
index 0000000..561ddaf
--- /dev/null
+++ b/cope2n-api/fwd_api/migrations/0196_subscriptionrequestfile_idx_gin_predict_result_and_more.py
@@ -0,0 +1,26 @@
+# Generated by Django 4.1.3 on 2024-11-28 07:10
+
+import django.contrib.postgres.indexes
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fwd_api', '0195_alter_subscriptionrequest_request_id_and_more'),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name='subscriptionrequestfile',
+            index=django.contrib.postgres.indexes.GinIndex(fields=['predict_result'], name='idx_gin_predict_result'),
+        ),
+        migrations.AddIndex(
+            model_name='subscriptionrequestfile',
+            index=django.contrib.postgres.indexes.GinIndex(fields=['feedback_result'], name='idx_gin_feedback_result'),
+        ),
+        migrations.AddIndex(
+            model_name='subscriptionrequestfile',
+            index=django.contrib.postgres.indexes.GinIndex(fields=['reviewed_result'], name='idx_gin_reviewed_result'),
+        ),
+    ]
diff --git a/cope2n-api/fwd_api/migrations/0197_subscriptionrequest_idx_gin_rq_predict_result_and_more.py b/cope2n-api/fwd_api/migrations/0197_subscriptionrequest_idx_gin_rq_predict_result_and_more.py
new file mode 100644
index 0000000..3a8f521
--- /dev/null
+++ b/cope2n-api/fwd_api/migrations/0197_subscriptionrequest_idx_gin_rq_predict_result_and_more.py
@@ -0,0 +1,26 @@
+# Generated by Django 4.1.3 on 2024-11-28 09:04
+
+import django.contrib.postgres.indexes
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fwd_api', '0196_subscriptionrequestfile_idx_gin_predict_result_and_more'),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name='subscriptionrequest',
+            index=django.contrib.postgres.indexes.GinIndex(fields=['predict_result'], name='idx_gin_rq_predict_result'),
+        ),
+        migrations.AddIndex(
+            model_name='subscriptionrequest',
+            index=django.contrib.postgres.indexes.GinIndex(fields=['feedback_result'], name='idx_gin_rq_feedback_result'),
+        ),
+        migrations.AddIndex(
+            model_name='subscriptionrequest',
+            index=django.contrib.postgres.indexes.GinIndex(fields=['reviewed_result'], name='idx_gin_rq_reviewed_result'),
+        ),
+    ]
diff --git a/cope2n-api/fwd_api/migrations/0198_alter_subscriptionrequest_doc_type.py b/cope2n-api/fwd_api/migrations/0198_alter_subscriptionrequest_doc_type.py
new file mode 100644
index 0000000..c553826
--- /dev/null
+++ b/cope2n-api/fwd_api/migrations/0198_alter_subscriptionrequest_doc_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1.3 on 2024-11-28 09:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fwd_api', '0197_subscriptionrequest_idx_gin_rq_predict_result_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subscriptionrequest',
+            name='doc_type',
+            field=models.CharField(db_index=True, max_length=100),
+        ),
+    ]
diff --git a/cope2n-api/fwd_api/models/SubscriptionRequest.py b/cope2n-api/fwd_api/models/SubscriptionRequest.py
index 0b89fdf..24fc53b 100755
--- a/cope2n-api/fwd_api/models/SubscriptionRequest.py
+++ b/cope2n-api/fwd_api/models/SubscriptionRequest.py
@@ -1,5 +1,6 @@
 from django.db import models
 from django.utils import timezone
+from django.contrib.postgres.indexes import GinIndex
 
 from fwd_api.models.Subscription import Subscription
 
@@ -7,7 +8,7 @@ class SubscriptionRequest(models.Model):
     id = models.AutoField(primary_key=True)
     pages: int = models.IntegerField()
     pages_left: int = models.IntegerField(default=1)
-    doc_type: str = models.CharField(max_length=100)
+    doc_type: str = models.CharField(max_length=100, db_index=True)
     request_id = models.CharField(max_length=200, db_index=True)  # Change to request_id
     redemption_id = models.CharField(max_length=200, null=True)
     process_type = models.CharField(max_length=200)  # driver/id/invoice
@@ -39,3 +40,10 @@ class SubscriptionRequest(models.Model):
     is_reviewed = models.BooleanField(default=False)
     is_required = models.BooleanField(default=True)
     subsidiary = models.CharField(default="", null=True, max_length=200)
+
+    class Meta:
+        indexes = [
+            GinIndex(fields=['predict_result'], name='idx_gin_rq_predict_result'),
+            GinIndex(fields=['feedback_result'], name='idx_gin_rq_feedback_result'),
+            GinIndex(fields=['reviewed_result'], name='idx_gin_rq_reviewed_result'),
+        ]
\ No newline at end of file
diff --git a/cope2n-api/fwd_api/models/SubscriptionRequestFile.py b/cope2n-api/fwd_api/models/SubscriptionRequestFile.py
index e9ffc22..1dce06d 100755
--- a/cope2n-api/fwd_api/models/SubscriptionRequestFile.py
+++ b/cope2n-api/fwd_api/models/SubscriptionRequestFile.py
@@ -1,5 +1,5 @@
 from django.db import models
-
+from django.contrib.postgres.indexes import GinIndex
 from fwd_api.constant.common import FileCategory
 from fwd_api.models import SubscriptionRequest
 from fwd_api.models.fields.EncryptedCharField import EncryptedCharField
@@ -40,5 +40,8 @@ class SubscriptionRequestFile(models.Model):
         indexes = [
             models.Index(fields=['request', 'index_in_request', 'doc_type']),  # For updating results
             models.Index(fields=['request', 'file_name']), # for getting image files by AI
+            GinIndex(fields=['predict_result'], name='idx_gin_predict_result'),
+            GinIndex(fields=['feedback_result'], name='idx_gin_feedback_result'),
+            GinIndex(fields=['reviewed_result'], name='idx_gin_reviewed_result'),
         ]
 

From dbf9a889da9c235b0895a2b5ec84cce42a39f76c Mon Sep 17 00:00:00 2001
From: TannedCung <dx.tan@samsung.com>
Date: Thu, 28 Nov 2024 16:45:32 +0700
Subject: [PATCH 04/13] Fix: Build error

---
 cope2n-fe/package.json                 | 2 +-
 cope2n-fe/src/pages/reviews2/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cope2n-fe/package.json b/cope2n-fe/package.json
index a05845f..fb1b005 100644
--- a/cope2n-fe/package.json
+++ b/cope2n-fe/package.json
@@ -83,7 +83,7 @@
     "prettier-plugin-organize-imports": "^3.2.1",
     "rollup-plugin-visualizer": "^5.9.0",
     "sass": "^1.57.1",
-    "typescript": "5.6.3",
+    "typescript": "^5.6.3",
     "vite": "^4.0.3",
     "vite-plugin-svgr": "^2.4.0",
     "vite-tsconfig-paths": "^4.0.3"
diff --git a/cope2n-fe/src/pages/reviews2/index.tsx b/cope2n-fe/src/pages/reviews2/index.tsx
index 2f73edb..28646be 100644
--- a/cope2n-fe/src/pages/reviews2/index.tsx
+++ b/cope2n-fe/src/pages/reviews2/index.tsx
@@ -875,7 +875,7 @@ const ReviewPage = () => {
           <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
             <Button
               type='primary'
-              color='success'
+              // color='success'
               size='middle'
               style={{
                 height: '36px',

From cdfdb0c25b8e23d9e62ebd73f944ee528c3abfa0 Mon Sep 17 00:00:00 2001
From: TannedCung <dx.tan@samsung.com>
Date: Thu, 28 Nov 2024 16:45:49 +0700
Subject: [PATCH 05/13] Fix: Dockerfile

---
 cope2n-api/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cope2n-api/Dockerfile b/cope2n-api/Dockerfile
index 20eeeb2..f01b570 100755
--- a/cope2n-api/Dockerfile
+++ b/cope2n-api/Dockerfile
@@ -14,7 +14,7 @@ RUN pip install --upgrade pip
 RUN pip install uvicorn gunicorn Celery
 
 # For intergration with sdskvu
-RUN pip install pip install torch==1.13.1+cu116 torchvision==0.14.1+cu116 torchaudio==0.13.1 --extra-index-url https://download.pytorch.org/whl/cu116
+RUN pip install torch==1.13.1+cu116 torchvision==0.14.1+cu116 torchaudio==0.13.1 --extra-index-url https://download.pytorch.org/whl/cu116
 RUN pip install -U openmim==0.3.7 --no-cache-dir
 RUN mim install mmcv-full==1.7.2
 # RUN pip install fastdeploy-gpu-python==1.0.7 -f https://www.paddlepaddle.org.cn/whl/fastdeploy.html --no-cache-dir

From 40cd3189acd0a17dcdd10e5cc3ff265e9951bec1 Mon Sep 17 00:00:00 2001
From: TannedCung <dx.tan@samsung.com>
Date: Mon, 2 Dec 2024 14:19:04 +0700
Subject: [PATCH 06/13] doc_type to be "only_include"

---
 cope2n-api/fwd/settings.py              | 1 +
 cope2n-api/fwd_api/api/accuracy_view.py | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cope2n-api/fwd/settings.py b/cope2n-api/fwd/settings.py
index 86d4832..8f05d50 100755
--- a/cope2n-api/fwd/settings.py
+++ b/cope2n-api/fwd/settings.py
@@ -245,6 +245,7 @@ FIELDS_BY_SUB = {
 BAD_THRESHOLD = 0.75
 NEED_REVIEW = 1.0
 
+DOC_TYPES = ["imei", "invoice"]
 SUB_FOR_BILLING = ["all", "seao"]
 FIELD = ["imei_number", "purchase_date", "retailername", "sold_to_party", "invoice_no"]
 
diff --git a/cope2n-api/fwd_api/api/accuracy_view.py b/cope2n-api/fwd_api/api/accuracy_view.py
index ec48e65..327b469 100755
--- a/cope2n-api/fwd_api/api/accuracy_view.py
+++ b/cope2n-api/fwd_api/api/accuracy_view.py
@@ -78,6 +78,7 @@ class AccuracyViewSet(viewsets.ViewSet):
                 description='Which subsidiary to be included',
                 type=OpenApiTypes.STR,
                 enum=list(settings.SUBS.keys()),
+                required=True
             ),
             OpenApiParameter(
                 name='request_id',
@@ -138,6 +139,7 @@ class AccuracyViewSet(viewsets.ViewSet):
                 location=OpenApiParameter.QUERY,
                 description='Filter by document type',
                 type=OpenApiTypes.STR,
+                enum=list(settings.DOC_TYPES.keys()),
                 required=False
             ),
         ],
@@ -231,7 +233,10 @@ class AccuracyViewSet(viewsets.ViewSet):
             if reviewed_result:
                 base_query &= Q(reviewed_result__icontains=reviewed_result)
             if doc_type:
-                base_query &= Q(doc_type__icontains=doc_type)
+                if doc_type.lower() == 'invoice':
+                    base_query &= Q(doc_type__regex=r'^invoice(,\s*invoice)*$')
+                elif doc_type.lower() == 'imei':
+                    base_query &= Q(doc_type__regex=r'^imei(,\s*imei)*$')
 
             if isinstance(max_accuracy, float):
                 base_query &= Q(raw_accuracy__lt=(

From 87634b3d3f6596b2248f0db4341a38571f87498f Mon Sep 17 00:00:00 2001
From: yagin <nd.hien1@samsung.com>
Date: Tue, 3 Dec 2024 16:18:20 +0700
Subject: [PATCH 07/13] [yagin] add 4 more filter for review2

---
 cope2n-fe/src/locales/en/messages.json |  6 +-
 cope2n-fe/src/locales/vi/messages.json |  6 +-
 cope2n-fe/src/pages/reviews2/api.ts    | 30 +++++++--
 cope2n-fe/src/pages/reviews2/const.ts  |  6 ++
 cope2n-fe/src/pages/reviews2/index.tsx | 84 ++++++++++++++++++++++++++
 cope2n-fe/src/request/api.ts           |  2 +-
 6 files changed, 125 insertions(+), 9 deletions(-)

diff --git a/cope2n-fe/src/locales/en/messages.json b/cope2n-fe/src/locales/en/messages.json
index 14c51d8..47da522 100644
--- a/cope2n-fe/src/locales/en/messages.json
+++ b/cope2n-fe/src/locales/en/messages.json
@@ -70,5 +70,9 @@
   "You are only allowed to upload {0} file.": "You are only allowed to upload {0} file.",
   "You have unsaved changes!": "You have unsaved changes!",
   "Your current password has expired. Please change your password to continue.": "Your current password has expired. Please change your password to continue.",
-  "max_accuracy": "Max accuracy"
+  "max_accuracy": "Max accuracy",
+  "docType": "Only type",
+  "Feedback Result": "Feedback Result",
+  "Predict Result": "Predict Result",
+  "Reviewed Result": "Reviewed Result"
 }
diff --git a/cope2n-fe/src/locales/vi/messages.json b/cope2n-fe/src/locales/vi/messages.json
index 664a5da..924a65a 100644
--- a/cope2n-fe/src/locales/vi/messages.json
+++ b/cope2n-fe/src/locales/vi/messages.json
@@ -70,5 +70,9 @@
   "You are only allowed to upload {0} file.": "Bạn chỉ được phép tải lên {0}.",
   "You have unsaved changes!": "Bạn có những thay đổi chưa được lưu!",
   "Your current password has expired. Please change your password to continue.": "",
-  "max_accuracy": "Độ chính xác tối đa"
+  "max_accuracy": "Độ chính xác tối đa",
+  "DocType": "Kiểu tài liệu",
+  "Feedback Result": "",
+  "Predict Result": "",
+  "Reviewed Result": ""
 }
diff --git a/cope2n-fe/src/pages/reviews2/api.ts b/cope2n-fe/src/pages/reviews2/api.ts
index 3e08ee2..c008266 100644
--- a/cope2n-fe/src/pages/reviews2/api.ts
+++ b/cope2n-fe/src/pages/reviews2/api.ts
@@ -2,10 +2,14 @@ import { baseURL } from 'request/api';
 import { RecentRequest } from './const';
 
 export const fetchAllRequests = async (
-  filterDateRange,
-  filterSubsidiaries,
-  filterReviewState,
-  filterIncludeTests,
+  filterDateRange: any[],
+  filterSubsidiaries: string,
+  filterReviewState: string,
+  filterIncludeTests: string,
+  filterDoctype: string,
+  filterFeedbackResult: string,
+  filterPredictResult: string,
+  filterReviewedResult: string,
   page = 1,
   page_size = 20,
   max_accuracy = 100,
@@ -25,6 +29,20 @@ export const fetchAllRequests = async (
   if (filterIncludeTests) {
     filterStr += `includes_test=${filterIncludeTests}&`;
   }
+  // add 4 more field
+  if (filterDoctype) {
+    filterStr += `doc_type=${filterDoctype}&`;
+  }
+  if (filterFeedbackResult) {
+    filterStr += `feedback_result=${filterFeedbackResult}&`;
+  }
+  if (filterPredictResult) {
+    filterStr += `predict_result=${filterPredictResult}&`;
+  }
+  if (filterReviewedResult) {
+    filterStr += `reviewed_result=${filterReviewedResult}&`;
+  }
+  //
   if (startDate && endDate) {
     filterStr += `start_date=${startDate}&end_date=${endDate}&`;
   }
@@ -54,7 +72,7 @@ export const confirmRequest = async (requestID: any) => {
     body: JSON.stringify({ request_file_results: [] }),
   })
 
-    
+
 };
 
 export const updateRevisedDataByFile = async (
@@ -77,7 +95,7 @@ export const updateRevisedDataByFile = async (
   )
 };
 
-export const fetchRequest = async (id) => {
+export const fetchRequest = async (id: string) => {
   const token = localStorage.getItem('sbt-token') || '';
   const response = await fetch(`${baseURL}/ctel/request/${id}/`, {
     method: 'GET',
diff --git a/cope2n-fe/src/pages/reviews2/const.ts b/cope2n-fe/src/pages/reviews2/const.ts
index 86592c7..7c883dc 100644
--- a/cope2n-fe/src/pages/reviews2/const.ts
+++ b/cope2n-fe/src/pages/reviews2/const.ts
@@ -48,6 +48,12 @@ export const SUBSIDIARIES = [
   { value: 'SEIN', label: 'SEIN' },
 ];
 
+export const DOCTYPE = [
+  { value: null, label: '--' },
+  { value: 'imei', label: 'imei' },
+  { value: 'invoice', label: 'invoice' },
+];
+
 export const SOURCE_KEYS = [
   'retailername',
   'sold_to_party',
diff --git a/cope2n-fe/src/pages/reviews2/index.tsx b/cope2n-fe/src/pages/reviews2/index.tsx
index 2f73edb..f38b0d2 100644
--- a/cope2n-fe/src/pages/reviews2/index.tsx
+++ b/cope2n-fe/src/pages/reviews2/index.tsx
@@ -41,6 +41,7 @@ import {
 } from './api';
 import {
   counter_measure_map,
+  DOCTYPE,
   FEEDBACK_ACCURACY,
   FEEDBACK_RESULT,
   PREDICTED_RESULT,
@@ -71,6 +72,10 @@ const ReviewPage = () => {
   const [filterAccuracy, setFilterAccuracy] = useState(100);
   const [filterReviewState, setFilterReviewState] = useState('all');
   const [filterIncludeTests, setFilterIncludesTests] = useState('true');
+  const [filterDoctype, setFilterDoctype] = useState(null);
+  const [filterFeedbackResult, setFilterFeedbackResult] = useState('');
+  const [filterPredictResult, setFilterPredictResult] = useState('');
+  const [filterReviewedResult, setFilterReviewedResult] = useState('');
   // const [requests, setRequests] = useState([]);
   const [currentRequest, setCurrentRequest] = useState(null);
   const [currentRequestIndex, setCurrentRequestIndex] = useState(1);
@@ -109,6 +114,10 @@ const ReviewPage = () => {
         filterSubsidiaries,
         filterReviewState,
         filterIncludeTests,
+        filterDoctype,
+        filterFeedbackResult,
+        filterPredictResult,
+        filterReviewedResult,
         1,
         1,
         filterAccuracy,
@@ -218,6 +227,10 @@ const ReviewPage = () => {
       filterSubsidiaries,
       filterReviewState,
       filterIncludeTests,
+      filterDoctype,
+      filterFeedbackResult,
+      filterPredictResult,
+      filterReviewedResult,
       requestIndex,
       1,
       filterAccuracy,
@@ -273,6 +286,10 @@ const ReviewPage = () => {
       filterSubsidiaries,
       filterReviewState,
       filterIncludeTests,
+      filterDoctype,
+      filterFeedbackResult,
+      filterPredictResult,
+      filterReviewedResult,
       1,
       1,
       filterAccuracy,
@@ -1025,6 +1042,73 @@ const ReviewPage = () => {
               />
             </Form.Item>
           </div>
+          {/* add 4 more filter fields */}
+          <div
+            style={{
+              marginTop: 10,
+              display: 'flex',
+              justifyContent: 'space-between',
+              marginLeft: 0,
+              padding: 0,
+            }}
+          >
+            <Form.Item
+              name='doc_type'
+              label={t`Only type`}
+              rules={[
+                {
+                  required: true,
+                  message: 'Please select a document type',
+                },
+              ]}
+            >
+              <Select
+                placeholder='Select a document type'
+                style={{ width: 200 }}
+                options={DOCTYPE}
+                value={filterDoctype}
+                defaultValue={filterDoctype}
+                onChange={setFilterDoctype}
+              />
+            </Form.Item>
+            <Form.Item
+              name='feedback_result'
+              label={t`Feedback includes`}
+            >
+              <Input
+                defaultValue={filterFeedbackResult}
+                onChange={(e) => setFilterFeedbackResult(e.target.value)}
+              />
+            </Form.Item>
+          </div>
+          <div
+            style={{
+              marginTop: 10,
+              display: 'flex',
+              justifyContent: 'space-between',
+              marginLeft: 0,
+              padding: 0,
+            }}
+          >
+            <Form.Item
+              name='predict_result'
+              label={t`Predict includes`}
+            >
+              <Input
+                defaultValue={filterPredictResult}
+                onChange={(e) => setFilterPredictResult(e.target.value)}
+              />
+            </Form.Item>
+            <Form.Item
+              name='reviewed_result'
+              label={t`Review inculdes`}
+            >
+             <Input
+                defaultValue={filterReviewedResult}
+                onChange={(e) => setFilterReviewedResult(e.target.value)}
+              />
+            </Form.Item>
+          </div>
         </Form>
       </Modal>
       <Modal
diff --git a/cope2n-fe/src/request/api.ts b/cope2n-fe/src/request/api.ts
index 2eecbfb..22bea54 100644
--- a/cope2n-fe/src/request/api.ts
+++ b/cope2n-fe/src/request/api.ts
@@ -11,7 +11,7 @@ const environment = process.env.NODE_ENV;
 const AXIOS_TIMEOUT_MS = 30 * 60 * 1000; // This config sastified long-live upload file request
 const EXPIRED_PASSWORD_SIGNAL = 'expired_password';
 
-export const baseURL = environment === 'development' ? 'http://107.120.133.27:9881/api' : '/api';
+export const baseURL = environment === 'development' ? 'http://107.120.133.27:19001/api' : '/api';
 // export const baseURL = '/api';
 
 

From 8b3cde536b66a55d8ef28060dbaa90a066285652 Mon Sep 17 00:00:00 2001
From: yagin <nd.hien1@samsung.com>
Date: Tue, 3 Dec 2024 16:47:10 +0700
Subject: [PATCH 08/13] [yagin]add key for SOURCE_KEYS list

---
 cope2n-fe/src/pages/reviews2/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cope2n-fe/src/pages/reviews2/index.tsx b/cope2n-fe/src/pages/reviews2/index.tsx
index f38b0d2..e0ffa3d 100644
--- a/cope2n-fe/src/pages/reviews2/index.tsx
+++ b/cope2n-fe/src/pages/reviews2/index.tsx
@@ -788,7 +788,7 @@ const ReviewPage = () => {
                 }
               } catch (error) {}
               return (
-                <div style={{ margin: '0 0 8px' }} className='file-input-group'>
+                <div style={{ margin: '0 0 8px' }} className='file-input-group' key={data}>
                   <div
                     style={{
                       display: 'flex',

From a6f6eb5a3427ebb5c8daf37c6ada134d375675df Mon Sep 17 00:00:00 2001
From: yagin <nd.hien1@samsung.com>
Date: Wed, 4 Dec 2024 10:57:02 +0700
Subject: [PATCH 09/13] [yagin]add condition render for viewer component

---
 cope2n-fe/src/pages/reviews2/index.tsx | 43 +++++++++++++-------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/cope2n-fe/src/pages/reviews2/index.tsx b/cope2n-fe/src/pages/reviews2/index.tsx
index e0ffa3d..f192984 100644
--- a/cope2n-fe/src/pages/reviews2/index.tsx
+++ b/cope2n-fe/src/pages/reviews2/index.tsx
@@ -416,18 +416,18 @@ const ReviewPage = () => {
       style={
         fullscreen
           ? {
-              position: 'fixed',
-              top: 0,
-              left: 0,
-              width: '100%',
-              height: '100%',
-              backgroundColor: '#fff',
-              zIndex: 1000,
-            }
+            position: 'fixed',
+            top: 0,
+            left: 0,
+            width: '100%',
+            height: '100%',
+            backgroundColor: '#fff',
+            zIndex: 1000,
+          }
           : {
-              height: '100%',
-              position: 'relative',
-            }
+            height: '100%',
+            position: 'relative',
+          }
       }
     >
       <div
@@ -578,11 +578,11 @@ const ReviewPage = () => {
                 overflow: 'auto',
               }}
             >
-              <Viewer
+              {selectedFileData && <Viewer
                 plugins={[defaultLayoutPluginInstance]}
                 fileUrl={selectedFileData}
                 onDocumentLoad={() => setImageLoading(false)}
-              />
+              />}
             </div>
           ) : (
             <div
@@ -756,11 +756,10 @@ const ReviewPage = () => {
           >
             <Input
               size='middle'
-              value={`Sub: ${filterSubsidiaries}, Date:${
-                filterDateRange[0]
-                  ? filterDateRange[0] + ' to ' + filterDateRange[1]
-                  : 'All'
-              }, Reviewed: ${filterReviewState}, Tests: ${filterIncludeTests}`}
+              value={`Sub: ${filterSubsidiaries}, Date:${filterDateRange[0]
+                ? filterDateRange[0] + ' to ' + filterDateRange[1]
+                : 'All'
+                }, Reviewed: ${filterReviewState}, Tests: ${filterIncludeTests}`}
               readOnly
             />
             <Button
@@ -781,12 +780,12 @@ const ReviewPage = () => {
               let shouldRevised = false;
               try {
                 if (
-                  selectedFileDataSource[data]?.[FEEDBACK_ACCURACY].length > 0
+                  selectedFileDataSource[data]?.[FEEDBACK_ACCURACY]?.length > 0
                 ) {
                   shouldRevised =
                     selectedFileDataSource[data][FEEDBACK_ACCURACY][0] < 1;
                 }
-              } catch (error) {}
+              } catch (error) { }
               return (
                 <div style={{ margin: '0 0 8px' }} className='file-input-group' key={data}>
                   <div
@@ -875,7 +874,7 @@ const ReviewPage = () => {
                 options={SOLUTION_BAD_QUALITY}
                 onChange={setSolution}
                 value={solution}
-                // defaultValue={solution}
+              // defaultValue={solution}
               />
               {solution === 'other' && (
                 <Input
@@ -1103,7 +1102,7 @@ const ReviewPage = () => {
               name='reviewed_result'
               label={t`Review inculdes`}
             >
-             <Input
+              <Input
                 defaultValue={filterReviewedResult}
                 onChange={(e) => setFilterReviewedResult(e.target.value)}
               />

From c7ca48bbd868c7cfe912beb13e0c50e832b42813 Mon Sep 17 00:00:00 2001
From: yagin <nd.hien1@samsung.com>
Date: Wed, 4 Dec 2024 13:27:39 +0700
Subject: [PATCH 10/13] [yagin]fix hot issue and warning

---
 cope2n-fe/src/components/left-menu/index.tsx | 2 +-
 cope2n-fe/src/components/spin/index.tsx      | 1 -
 cope2n-fe/src/pages/reviews2/api.ts          | 2 +-
 cope2n-fe/src/pages/reviews2/index.tsx       | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cope2n-fe/src/components/left-menu/index.tsx b/cope2n-fe/src/components/left-menu/index.tsx
index d0390dc..3bee952 100644
--- a/cope2n-fe/src/components/left-menu/index.tsx
+++ b/cope2n-fe/src/components/left-menu/index.tsx
@@ -1,4 +1,4 @@
-import { AppstoreOutlined, BarChartOutlined, RotateRightOutlined, FileSearchOutlined } from '@ant-design/icons';
+import { AppstoreOutlined, BarChartOutlined, RotateRightOutlined } from '@ant-design/icons';
 import { t } from '@lingui/macro';
 import { Menu, MenuProps } from 'antd';
 import React from 'react';
diff --git a/cope2n-fe/src/components/spin/index.tsx b/cope2n-fe/src/components/spin/index.tsx
index 3c1b782..a11eba0 100644
--- a/cope2n-fe/src/components/spin/index.tsx
+++ b/cope2n-fe/src/components/spin/index.tsx
@@ -4,7 +4,6 @@ export function GlobalSpin() {
   return (
     <Spin
       size='large'
-      tip='Loading ...'
       style={{
         position: 'fixed',
         top: '50%',
diff --git a/cope2n-fe/src/pages/reviews2/api.ts b/cope2n-fe/src/pages/reviews2/api.ts
index c008266..229ac6c 100644
--- a/cope2n-fe/src/pages/reviews2/api.ts
+++ b/cope2n-fe/src/pages/reviews2/api.ts
@@ -105,7 +105,7 @@ export const fetchRequest = async (id: string) => {
   });
   return await (
     await response.json()
-  ).subscription_requests[0];
+  ).subscription_requests?.[0] || null;
 };
 
 export const addRecentRequest = (
diff --git a/cope2n-fe/src/pages/reviews2/index.tsx b/cope2n-fe/src/pages/reviews2/index.tsx
index f192984..d66c5ef 100644
--- a/cope2n-fe/src/pages/reviews2/index.tsx
+++ b/cope2n-fe/src/pages/reviews2/index.tsx
@@ -172,7 +172,7 @@ const ReviewPage = () => {
 
   const setAndLoadSelectedFile = async (requestData, index) => {
     setSelectedFileId(index);
-    if (!requestData['Files'][index]) {
+    if (!requestData?.['Files'][index]) {
       setSelectedFileData('FAILED_TO_LOAD_FILE');
       setImageLoading(false);
       return;
@@ -588,7 +588,7 @@ const ReviewPage = () => {
             <div
               style={{
                 flexGrow: 1,
-                overflow: 'auto',
+                overflowY: 'auto',
                 display: 'flex',
                 justifyContent: 'center',
                 alignItems: 'center',

From 55c81a2dcf885ef140e92c6c8d460bbf2a97d247 Mon Sep 17 00:00:00 2001
From: TannedCung <dx.tan@samsung.com>
Date: Wed, 4 Dec 2024 15:47:05 +0700
Subject: [PATCH 11/13] Fix: settings

---
 cope2n-api/fwd_api/api/accuracy_view.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cope2n-api/fwd_api/api/accuracy_view.py b/cope2n-api/fwd_api/api/accuracy_view.py
index 327b469..3fd2ed1 100755
--- a/cope2n-api/fwd_api/api/accuracy_view.py
+++ b/cope2n-api/fwd_api/api/accuracy_view.py
@@ -139,7 +139,7 @@ class AccuracyViewSet(viewsets.ViewSet):
                 location=OpenApiParameter.QUERY,
                 description='Filter by document type',
                 type=OpenApiTypes.STR,
-                enum=list(settings.DOC_TYPES.keys()),
+                enum=list(settings.DOC_TYPES),
                 required=False
             ),
         ],

From 1867259d5e6cf318e5b859b2f4dd32e2f8dca33e Mon Sep 17 00:00:00 2001
From: TannedCung <dx.tan@samsung.com>
Date: Wed, 4 Dec 2024 17:07:13 +0700
Subject: [PATCH 12/13] Add: bad_reason filter

---
 cope2n-api/fwd_api/api/accuracy_view.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/cope2n-api/fwd_api/api/accuracy_view.py b/cope2n-api/fwd_api/api/accuracy_view.py
index 3fd2ed1..9968dae 100755
--- a/cope2n-api/fwd_api/api/accuracy_view.py
+++ b/cope2n-api/fwd_api/api/accuracy_view.py
@@ -142,6 +142,13 @@ class AccuracyViewSet(viewsets.ViewSet):
                 enum=list(settings.DOC_TYPES),
                 required=False
             ),
+            OpenApiParameter(
+                name='bad_reason',
+                location=OpenApiParameter.QUERY,
+                description='Filter by bad reason',
+                type=OpenApiTypes.STR,
+                required=False
+            ),
         ],
         responses=None, tags=['Accuracy']
     )
@@ -163,6 +170,7 @@ class AccuracyViewSet(viewsets.ViewSet):
             feedback_result = request.GET.get('feedback_result', None)
             reviewed_result = request.GET.get('reviewed_result', None)
             doc_type = request.GET.get('doc_type', None)
+            bad_reason = request.GET.get('bad_reason', None)
 
             base_query = Q(status=200)
             if start_date_str or end_date_str:
@@ -242,6 +250,12 @@ class AccuracyViewSet(viewsets.ViewSet):
                 base_query &= Q(raw_accuracy__lt=(
                     max_accuracy/100)) | Q(raw_accuracy__isnull=True)
 
+            if bad_reason:
+                bad_reason_subquery = SubscriptionRequestFile.objects.filter(
+                    reason__icontains=bad_reason
+                ).values_list('request_id', flat=True)
+                base_query &= Q(id__in=bad_reason_subquery)
+
             subscription_requests = SubscriptionRequest.objects.filter(
                 base_query).order_by('created_at')
 

From 478e09408dcd69a98fa6f22607a86350e1373041 Mon Sep 17 00:00:00 2001
From: TannedCung <dx.tan@samsung.com>
Date: Wed, 4 Dec 2024 17:19:17 +0700
Subject: [PATCH 13/13] Index reason for better perfomance

---
 ...199_alter_subscriptionrequestfile_reason.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 cope2n-api/fwd_api/migrations/0199_alter_subscriptionrequestfile_reason.py

diff --git a/cope2n-api/fwd_api/migrations/0199_alter_subscriptionrequestfile_reason.py b/cope2n-api/fwd_api/migrations/0199_alter_subscriptionrequestfile_reason.py
new file mode 100644
index 0000000..8a245fb
--- /dev/null
+++ b/cope2n-api/fwd_api/migrations/0199_alter_subscriptionrequestfile_reason.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1.3 on 2024-12-04 10:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fwd_api', '0198_alter_subscriptionrequest_doc_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subscriptionrequestfile',
+            name='reason',
+            field=models.TextField(blank=True, db_index=True),
+        ),
+    ]