Skip to content

Commit

Permalink
Merge branch 'remove-rebuild-searches-from-make' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
RabiaSajjad committed Nov 5, 2024
2 parents 963da4c + fa8f63b commit 8690d8a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
5 changes: 0 additions & 5 deletions bin/pd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,6 @@ upload-hospitalityq: $(workdir)/filtered/hospitalityq.csv $(workdir)/filtered/ho
.PHONY: rebuild-hospitalityq
rebuild-hospitalityq: $(workdir)/filtered/hospitalityq.csv $(workdir)/filtered/hospitalityq-nil.csv
@$(echo_date) Rebuilding Hospitality Expenses...
$(ckan_command) -c $(portal_ini) pd rebuild hospitalityq --lenient --has-nil \
-f "$(workdir)/filtered/hospitalityq.csv" -f "$(workdir)/filtered/hospitalityq-nil.csv"
@$(oc_search) import_data_csv --csv "$(workdir)/filtered/hospitalityq.csv" --search hospitalityq --quiet
@$(oc_search) import_data_csv --csv "$(workdir)/filtered/hospitalityq-nil.csv" --search hospitalityq --quiet --nothing_to_report

Expand Down Expand Up @@ -557,9 +555,6 @@ upload-reclassification: $(workdir)/filtered/reclassification.csv $(workdir)/fil
.PHONY: rebuild-reclassification
rebuild-reclassification: $(workdir)/filtered/reclassification.csv $(workdir)/filtered/reclassification-nil.csv
@$(echo_date) Rebuilding Position Reclassification...
$(ckan_command) -c $(portal_ini) pd rebuild reclassification --lenient --has-nil \
-f "$(workdir)/filtered/reclassification.csv" -f "$(workdir)/filtered/reclassification-nil.csv"
@$(echo_date) Rebuilding Advanced Search...
@$(oc_search) import_data_csv --csv "$(workdir)/filtered/reclassification.csv" --search reclassification
@$(oc_search) import_data_csv --csv "$(workdir)/filtered/reclassification-nil.csv" --search reclassification --nothing_to_report

Expand Down
1 change: 1 addition & 0 deletions changes/1527.changes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Adding the Django Search to the PD Makefile for the Hospitalityq type.
4 changes: 4 additions & 0 deletions changes/1528.changes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Remove rebuilding the following searches from the Makefike:
- reclassification
- hospitalityq
The above searches are now rebuilt using the Django search.
8 changes: 4 additions & 4 deletions ckanext/canada/tests/test_make.py
Original file line number Diff line number Diff line change
Expand Up @@ -400,10 +400,10 @@ def test_make_hospitalityq(self):

stdout = stdout.decode("utf-8")

# Drupal/Solr, test for record indexing
# Django, just test for command output from echo
assert "Usage:" not in stdout
assert "rebuild-hospitalityq] Error" not in stdout
assert '%s 1' % self.org['name'] in stdout
assert 'import_data_csv' in stdout


def test_make_travelq(self):
Expand Down Expand Up @@ -475,10 +475,10 @@ def test_make_reclassification(self):

stdout = stdout.decode("utf-8")

# Drupal/Solr, test for record indexing
# Django, just test for command output from echo
assert "Usage:" not in stdout
assert "rebuild-reclassification] Error" not in stdout
assert '%s 1' % self.org['name'] in stdout
assert 'import_data_csv' in stdout


def test_make_service(self):
Expand Down

0 comments on commit 8690d8a

Please sign in to comment.