Skip to content

Commit

Permalink
test card and value deletion
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaxelb
aaxelb committed Nov 13, 2024
1 parent 7baa2a5 commit 84502d5
Show file tree
Hide file tree
Showing 2 changed files with 184 additions and 58 deletions.
233 changes: 179 additions & 54 deletions tests/share/search/index_strategy/_common_trovesearch_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,54 @@ def test_cardsearch(self):
self.cardsearch_cases(),
self.cardsearch_integer_cases(),
)
for _queryparams, _expected_result_iris in _cardsearch_cases:
_cardsearch_params = CardsearchParams.from_querystring(urlencode(_queryparams))
assert isinstance(_cardsearch_params, CardsearchParams)
_cardsearch_response = self.current_index.pls_handle_cardsearch(_cardsearch_params)
# assumes all results fit on one page
_actual_result_iris: set[str] | list[str] = [
self._indexcard_focus_by_uuid[_result.card_uuid]
for _result in _cardsearch_response.search_result_page
]
# test sort order only when expected results are ordered
if isinstance(_expected_result_iris, set):
_actual_result_iris = set(_actual_result_iris)
self.assertEqual(_expected_result_iris, _actual_result_iris, msg=f'?{_queryparams}')
for _queryparams, _expected_focus_iris in _cardsearch_cases:
self._assert_cardsearch_iris(_queryparams, _expected_focus_iris)

def test_cardsearch_after_deletion(self):
_cards = self._fill_test_data_for_querying()
_deleted_focus_iris = {BLARG.b}
self._delete_indexcards([_cards[_focus_iri] for _focus_iri in _deleted_focus_iris])
_cardsearch_cases = itertools.chain(
self.cardsearch_cases(),
self.cardsearch_integer_cases(),
)
for _queryparams, _expected_focus_iris in _cardsearch_cases:
if isinstance(_expected_focus_iris, set):
_expected_focus_iris -= _deleted_focus_iris
else:
_expected_focus_iris = [
_iri
for _iri in _expected_focus_iris
if _iri not in _deleted_focus_iris
]
self._assert_cardsearch_iris(_queryparams, _expected_focus_iris)

def test_cardsearch_after_updates(self):
_cards = self._fill_test_data_for_querying()
self._update_indexcard_content(_cards[BLARG.c], BLARG.c, {
BLARG.c: {
RDF.type: {BLARG.Thing},
DCTERMS.subject: {BLARG.subj_ac, BLARG.subj_c}, # subj_bc removed; subj_c added
DCTERMS.title: {rdf.literal('cccc')},
},
})
self._index_indexcards([_cards[BLARG.c]])
_cases = [
(
{'cardSearchFilter[subject]': BLARG.subj_bc},
{BLARG.b},
),
(
{'cardSearchFilter[subject]': BLARG.subj_ac},
{BLARG.c, BLARG.a},
),
(
{'cardSearchFilter[subject]': BLARG.subj_c},
{BLARG.c},
),
]
for _queryparams, _expected_focus_iris in _cases:
self._assert_cardsearch_iris(_queryparams, _expected_focus_iris)

def test_cardsearch_pagination(self):
_cards: list[trove_db.Indexcard] = []
Expand All @@ -79,10 +114,10 @@ def test_cardsearch_pagination(self):
_total_count = 55
_start_date = date(1999, 12, 31)
for _i in range(_total_count):
_card_iri = BLARG[f'i{_i}']
_expected_iris.add(_card_iri)
_cards.append(self._create_indexcard(_card_iri, {
_card_iri: {
_focus_iri = BLARG[f'i{_i}']
_expected_iris.add(_focus_iri)
_cards.append(self._create_indexcard(_focus_iri, {
_focus_iri: {
RDF.type: {BLARG.Thing},
DCTERMS.title: {rdf.literal(f'card #{_i}')},
DCTERMS.created: {rdf.literal(_start_date + timedelta(weeks=_i, days=_i))},
Expand Down Expand Up @@ -114,20 +149,80 @@ def test_cardsearch_pagination(self):

def test_valuesearch(self):
self._fill_test_data_for_querying()
_valuesearch_cases = itertools.chain(
self.valuesearch_simple_cases(),
self.valuesearch_complex_cases(),
)
for _queryparams, _expected_values in _valuesearch_cases:
_valuesearch_params = ValuesearchParams.from_querystring(urlencode(_queryparams))
assert isinstance(_valuesearch_params, ValuesearchParams)
_valuesearch_response = self.current_index.pls_handle_valuesearch(_valuesearch_params)
# assumes all results fit on one page
_actual_values = {
_result.value_iri or _result.value_value
for _result in _valuesearch_response.search_result_page
}
self.assertEqual(_expected_values, _actual_values)
for _queryparams, _expected_values in self.valuesearch_cases():
self._assert_valuesearch_values(_queryparams, _expected_values)

def test_valuesearch_after_deletion(self):
_cards = self._fill_test_data_for_querying()
_deleted_focus_iris = {BLARG.b}
self._delete_indexcards([_cards[_focus_iri] for _focus_iri in _deleted_focus_iris])
_cases = [
(
{'valueSearchPropertyPath': 'subject'},
{BLARG.subj_a, BLARG.subj_ac, BLARG.subj_bc, BLARG.subj_c}, # BLARG.subj_b no longer present
), (
{'valueSearchPropertyPath': 'dateCreated'},
{'1999', '2024'}, # 2012 no longer present
), (
{'valueSearchPropertyPath': 'subject', 'cardSearchText': 'bbbb'},
set(), # none
)
]
for _queryparams, _expected_values in _cases:
self._assert_valuesearch_values(_queryparams, _expected_values)

def test_valuesearch_after_updates(self):
_cards = self._fill_test_data_for_querying()
self._update_indexcard_content(_cards[BLARG.c], BLARG.c, {
BLARG.c: {
RDF.type: {BLARG.Thing},
DCTERMS.creator: {BLARG.someone_new}, # someone_else removed; someone_new added
DCTERMS.subject: {BLARG.subj_ac, BLARG.subj_c, BLARG.subj_new}, # subj_bc removed; subj_new added
DCTERMS.title: {rdf.literal('cccc')},
},
})
self._index_indexcards([_cards[BLARG.c]])
_cases = [
(
{'valueSearchPropertyPath': 'subject'},
{BLARG.subj_a, BLARG.subj_ac, BLARG.subj_b, BLARG.subj_bc, BLARG.subj_c, BLARG.subj_new}, # subj_c new
), (
{'valueSearchPropertyPath': 'subject', 'cardSearchFilter[creator]': BLARG.someone_new},
{BLARG.subj_ac, BLARG.subj_c, BLARG.subj_new},
), (
{'valueSearchPropertyPath': 'subject', 'cardSearchFilter[creator]': BLARG.someone_else},
set(), # none
)
]
for _queryparams, _expected_values in _cases:
self._assert_valuesearch_values(_queryparams, _expected_values)

def _assert_cardsearch_iris(self, queryparams: dict, expected_focus_iris: Iterable[str]):
_querystring = urlencode(queryparams)
_cardsearch_params = CardsearchParams.from_querystring(_querystring)
assert isinstance(_cardsearch_params, CardsearchParams)
_cardsearch_response = self.current_index.pls_handle_cardsearch(_cardsearch_params)
# assumes all results fit on one page
_actual_result_iris: set[str] | list[str] = [
self._indexcard_focus_by_uuid[_result.card_uuid]
for _result in _cardsearch_response.search_result_page
]
# test sort order only when expected results are ordered
if isinstance(expected_focus_iris, set):
_actual_result_iris = set(_actual_result_iris)
self.assertEqual(expected_focus_iris, _actual_result_iris, msg=f'?{_querystring}')

def _assert_valuesearch_values(self, queryparams, expected_values):
_querystring = urlencode(queryparams)
_valuesearch_params = ValuesearchParams.from_querystring(_querystring)
assert isinstance(_valuesearch_params, ValuesearchParams)
_valuesearch_response = self.current_index.pls_handle_valuesearch(_valuesearch_params)
# assumes all results fit on one page
_actual_values = {
_result.value_iri or _result.value_value
for _result in _valuesearch_response.search_result_page
}
self.assertEqual(expected_values, _actual_values, msg=f'?{_querystring}')

def _fill_test_data_for_querying(self):
_card_a = self._create_indexcard(BLARG.a, {
Expand All @@ -152,7 +247,7 @@ def _fill_test_data_for_querying(self):
},
BLARG.c: {
RDF.type: {BLARG.Thing},
DCTERMS.subject: {BLARG.subj_ac, BLARG.subj_bc},
DCTERMS.subject: {BLARG.subj_ac, BLARG.subj_bc, BLARG.subj_c},
DCTERMS.title: {rdf.literal('cccc')},
},
})
Expand All @@ -172,7 +267,7 @@ def _fill_test_data_for_querying(self):
},
BLARG.c: {
RDF.type: {BLARG.Thing},
DCTERMS.subject: {BLARG.subj_ac, BLARG.subj_bc},
DCTERMS.subject: {BLARG.subj_ac, BLARG.subj_bc, BLARG.subj_c},
DCTERMS.title: {rdf.literal('cccc')},
},
})
Expand All @@ -182,7 +277,7 @@ def _fill_test_data_for_querying(self):
DCTERMS.created: {rdf.literal(date(2024, 12, 31))},
DCTERMS.creator: {BLARG.someone_else},
DCTERMS.title: {rdf.literal('cccc')},
DCTERMS.subject: {BLARG.subj_ac, BLARG.subj_bc},
DCTERMS.subject: {BLARG.subj_ac, BLARG.subj_bc, BLARG.subj_c},
DCTERMS.description: {rdf.literal('The danger is unleashed only if you substantially disturb this place physically. This place is best shunned and left uninhabited.', language='en')},
},
BLARG.someone_else: {
Expand Down Expand Up @@ -213,7 +308,13 @@ def _fill_test_data_for_querying(self):
},
},
})
self._index_indexcards([_card_a, _card_b, _card_c])
_cards = {
BLARG.a: _card_a,
BLARG.b: _card_b,
BLARG.c: _card_c,
}
self._index_indexcards(_cards.values())
return _cards

def cardsearch_cases(self) -> Iterator[tuple[dict[str, str], set[str] | list[str]]]:
# using data from _fill_test_data_for_querying
Expand Down Expand Up @@ -402,7 +503,7 @@ def cardsearch_integer_cases(self) -> Iterator[tuple[dict[str, str], set[str] |
[BLARG.c, BLARG.a, BLARG.b], # ordered list
)

def valuesearch_simple_cases(self) -> Iterator[tuple[dict[str, str], set[str]]]:
def valuesearch_cases(self) -> Iterator[tuple[dict[str, str], set[str]]]:
yield (
{'valueSearchPropertyPath': 'references'},
{BLARG.b, BLARG.c},
Expand All @@ -411,9 +512,22 @@ def valuesearch_simple_cases(self) -> Iterator[tuple[dict[str, str], set[str]]]:
{'valueSearchPropertyPath': 'dateCreated'},
{'1999', '2012', '2024'},
)
# TODO: more

def valuesearch_complex_cases(self) -> Iterator[tuple[dict[str, str], set[str]]]:
yield (
{'valueSearchPropertyPath': 'subject'},
{BLARG.subj_a, BLARG.subj_ac, BLARG.subj_b, BLARG.subj_bc, BLARG.subj_c},
)
yield (
{'valueSearchPropertyPath': 'subject', 'cardSearchFilter[creator]': BLARG.someone},
{BLARG.subj_ac, BLARG.subj_bc, BLARG.subj_a, BLARG.subj_b},
)
yield (
{'valueSearchPropertyPath': 'subject', 'cardSearchFilter[creator]': BLARG.someone_else},
{BLARG.subj_ac, BLARG.subj_bc, BLARG.subj_c},
)
yield (
{'valueSearchPropertyPath': 'subject', 'cardSearchText': 'aaaa'},
{BLARG.subj_ac, BLARG.subj_a},
)
yield (
{
'valueSearchPropertyPath': 'references',
Expand Down Expand Up @@ -441,29 +555,40 @@ def _index_indexcards(self, indexcards: Iterable[trove_db.Indexcard]):
))
self.current_index.pls_refresh()

def _delete_indexcards(self, indexcards: Iterable[trove_db.Indexcard]):
for _indexcard in indexcards:
_indexcard.pls_delete(notify_indexes=False) # notify by hand to know when done
self._index_indexcards(indexcards)

def _create_indexcard(self, focus_iri: str, rdf_tripledict: rdf.RdfTripleDictionary) -> trove_db.Indexcard:
_suid = factories.SourceUniqueIdentifierFactory()
_raw = factories.RawDatumFactory(
suid=_suid,
)
_indexcard = trove_db.Indexcard.objects.create(
source_record_suid=_suid,
)
_indexcard = trove_db.Indexcard.objects.create(source_record_suid=_suid)
self._update_indexcard_content(_indexcard, focus_iri, rdf_tripledict)
# an osfmap_json card is required for indexing, but not used in these tests
trove_db.DerivedIndexcard.objects.create(
trove_db.DerivedIndexcard.objects.get_or_create(
upriver_indexcard=_indexcard,
deriver_identifier=trove_db.ResourceIdentifier.objects.get_or_create_for_iri(TROVE['derive/osfmap_json']),
)
trove_db.LatestIndexcardRdf.objects.create(
from_raw_datum=_raw,
indexcard=_indexcard,
focus_iri=focus_iri,
rdf_as_turtle=rdf.turtle_from_tripledict(rdf_tripledict),
turtle_checksum_iri='foo', # not enforced
)
self._indexcard_focus_by_uuid[str(_indexcard.uuid)] = focus_iri
return _indexcard

def _update_indexcard_content(
self,
indexcard: trove_db.Indexcard,
focus_iri: str,
rdf_tripledict: rdf.RdfTripleDictionary,
) -> None:
_raw = factories.RawDatumFactory(suid=indexcard.source_record_suid)
trove_db.LatestIndexcardRdf.objects.update_or_create(
indexcard=indexcard,
defaults={
'from_raw_datum': _raw,
'focus_iri': focus_iri,
'rdf_as_turtle': rdf.turtle_from_tripledict(rdf_tripledict),
'turtle_checksum_iri': 'foo', # not enforced
},
)
self._indexcard_focus_by_uuid[str(indexcard.uuid)] = focus_iri

def _create_supplement(
self,
indexcard: trove_db.Indexcard,
Expand Down
9 changes: 5 additions & 4 deletions trove/models/indexcard.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def supplementary_rdf_set(self):
def get_iri(self):
return trove_indexcard_iri(self.uuid)

def pls_delete(self):
def pls_delete(self, *, notify_indexes=True):
# do not actually delete Indexcard, just mark deleted:
if self.deleted is None:
self.deleted = timezone.now()
Expand All @@ -220,9 +220,10 @@ def pls_delete(self):
.filter(upriver_indexcard=self)
.delete()
)
# TODO: rearrange to avoid local import
from share.search.index_messenger import IndexMessenger
IndexMessenger().notify_indexcard_update([self])
if notify_indexes:
# TODO: rearrange to avoid local import
from share.search.index_messenger import IndexMessenger
IndexMessenger().notify_indexcard_update([self])

def __repr__(self):
return f'<{self.__class__.__qualname__}({self.uuid}, {self.source_record_suid})'
Expand Down

0 comments on commit 84502d5

Please sign in to comment.