Merge pull request #1460 from UUDigitalHumanitieslab/bugfix/#1452

Add size parameter only once on download
UUDigitalHumanitieslab · Feb 16, 2024 · e1e1834 · e1e1834
2 parents 792035f + 9f66728
commit e1e1834
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/backend/download/views.py b/backend/download/views.py
@@ -51,7 +51,7 @@ def post(self, request, *args, **kwargs):
             corpus = Corpus.objects.get(name=corpus_name)
             es_query = api_query_to_es_query(request.data, corpus_name)
             search_results = es_download.normal_search(
-                corpus_name, es_query, request.data['size'])
+                corpus_name, es_query)
             download = Download.objects.create(
                 download_type='search_results', corpus=corpus, parameters=request.data, user=request.user)
             csv_path = tasks.make_csv(search_results, request.data, download.id)

diff --git a/backend/es/download.py b/backend/es/download.py
@@ -39,10 +39,9 @@ def scroll(corpus, query_model, download_size=None, client=None, **kwargs):
     return output, total
 
 
-def normal_search(corpus, query_model, size):
+def normal_search(corpus, query_model):
     result = search(
-        corpus = corpus,
-        query_model=query_model,
-        size=size,
+        corpus=corpus,
+        query_model=query_model
     )
     return hits(result)
diff --git a/frontend/src/app/models/search-results.ts b/frontend/src/app/models/search-results.ts
@@ -111,7 +111,8 @@ export type ResultsDownloadParameters = {
 
 export type TermFrequencyDownloadParameters = DateTermFrequencyParameters[] | AggregateTermFrequencyParameters[];
 
-export type LimitedResultsDownloadParameters = ResultsDownloadParameters & { size: number } & DownloadOptions;
+export type LimitedResultsDownloadParameters = ResultsDownloadParameters &
+    DownloadOptions;
 
 export type DownloadType = 'search_results' | 'aggregate_term_frequency' | 'date_term_frequency' | 'ngram';
 export type DownloadStatus = 'done' | 'working' | 'error';

diff --git a/frontend/src/app/services/download.service.spec.ts b/frontend/src/app/services/download.service.spec.ts
@@ -56,25 +56,22 @@ describe('DownloadService', () => {
                                 query: 'test',
                                 lenient: true,
                                 default_operator: 'or',
-                            }
+                            },
                         },
                         filter: [],
-                    }
+                    },
                 },
-                sort: [
-                    { great_field: 'desc' },
-                ],
+                sort: [{ great_field: 'desc' }],
                 highlight: {
                     fragment_size: highlight,
                     pre_tags: ['<span class="highlight">'],
                     post_tags: ['</span>'],
                     order: 'score',
-                    fields: [ { speech: {} } ]
+                    fields: [{ speech: {} }],
                 },
                 from: 0,
                 size,
             },
-            size,
             encoding: 'utf-8',
         };
         expect(apiService.download).toHaveBeenCalledWith(expectedBody);

diff --git a/frontend/src/app/services/download.service.ts b/frontend/src/app/services/download.service.ts
@@ -39,7 +39,6 @@ export class DownloadService {
                 ...query,
                 corpus: corpus.name,
                 fields: fields.map((field) => field.name),
-                size: requestedResults,
                 route,
             },
             fileOptions