Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(gravsearch): Prevent duplicate results #1626

Merged
merged 47 commits into from Apr 16, 2020
Merged

fix(gravsearch): Prevent duplicate results #1626

merged 47 commits into from Apr 16, 2020

Commits on Feb 19, 2020

  1. feat(api-v2): Refactor to use ForbiddenResource consistently (ongoing).

    Benjamin Geer committed Feb 19, 2020
    Copy the full SHA
    3dbb59c View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2020

  1. Merge branch 'develop' into wip/1543-forbidden-resource 

    # Conflicts:
#	webapi/src/main/scala/org/knora/webapi/util/StringFormatter.scala
    Benjamin Geer committed Feb 28, 2020
    Copy the full SHA
    b6d3cf2 View commit details
    Browse the repository at this point in the history

  2. test: Fix tests.

    Benjamin Geer committed Feb 28, 2020
    Copy the full SHA
    49f4214 View commit details
    Browse the repository at this point in the history

  3. feat(api-v2): Use ForbiddenResource consistently (ongoing).

    Benjamin Geer committed Feb 28, 2020
    Copy the full SHA
    9171746 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into wip/1543-forbidden-resource

    Benjamin Geer committed Feb 28, 2020
    Copy the full SHA
    15c3be5 View commit details
    Browse the repository at this point in the history

  5. refactor(api-v2): Move ForbiddenResource from triplestore to app.

    Benjamin Geer committed Feb 28, 2020
    Copy the full SHA
    cae954d View commit details
    Browse the repository at this point in the history

  6. refactor(test): Simplify code.

    Benjamin Geer committed Feb 28, 2020
    Copy the full SHA
    d6c8fc0 View commit details
    Browse the repository at this point in the history

  7. refactor(api-v2): Simplify response processing (ongoing).

    Benjamin Geer committed Feb 28, 2020
    Copy the full SHA
    7f1d91f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into wip/1543-forbidden-resource

    Benjamin Geer committed Feb 28, 2020
    Copy the full SHA
    623630c View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2020

  1. feat(api-v2): Add ForbiddenValue (ongoing).

    Benjamin Geer committed Mar 3, 2020
    Copy the full SHA
    5d1b28e View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2020

  1. feat(api-v2): Remove ForbiddenResource (ongoing).

    Benjamin Geer committed Mar 4, 2020
    Copy the full SHA
    e86b20b View commit details
    Browse the repository at this point in the history

  2. test(api-v2): Fix compile error.

    Benjamin Geer committed Mar 4, 2020
    Copy the full SHA
    c25808e View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. feat(api-v2): Get rid of ForbiddenResource (ongoing).

    Benjamin Geer committed Mar 5, 2020
    Copy the full SHA
    d8d1c38 View commit details
    Browse the repository at this point in the history

  2. feat(api-v2): Remove ForbiddenResource (ongoing).

    Benjamin Geer committed Mar 5, 2020
    Copy the full SHA
    da23fc6 View commit details
    Browse the repository at this point in the history

  3. feat(api-v2): Remove ForbiddenResource (ongoing).

    Benjamin Geer committed Mar 5, 2020
    Copy the full SHA
    baeff8a View commit details
    Browse the repository at this point in the history

  4. feat(api-v2): Remove ForbiddenResource (ongoing).

    Benjamin Geer committed Mar 5, 2020
    Copy the full SHA
    144863d View commit details
    Browse the repository at this point in the history

  5. refactor(api-v2): Move checkResourceIris into ReadResourcesSequenceV2.

    Benjamin Geer committed Mar 5, 2020
    Copy the full SHA
    f3ed00c View commit details
    Browse the repository at this point in the history

  6. style(api-v2): Clean up a few things.

    Benjamin Geer committed Mar 5, 2020
    Copy the full SHA
    5de2b47 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2020

  1. docs(gravsearch): Update docs.

    Benjamin Geer committed Mar 6, 2020
    Copy the full SHA
    ba61578 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2020

  1. Merge branch 'develop' into wip/1543-forbidden-resource

    Benjamin Geer committed Mar 9, 2020
    Copy the full SHA
    8a0c8c6 View commit details
    Browse the repository at this point in the history

  2. initial commit of a possible test case

    @loicjaouen
    loicjaouen committed Mar 9, 2020
    Copy the full SHA
    ce602dc View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2020

  1. add the count route

    @loicjaouen
    loicjaouen committed Mar 10, 2020
    Copy the full SHA
    9499f85 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into wip/1543-forbidden-resource

    Benjamin Geer committed Mar 10, 2020
    Copy the full SHA
    62d843c View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2020

  1. Merge branch 'develop' into wip/1588_duplicates

    Benjamin Geer committed Mar 11, 2020
    Copy the full SHA
    81ec5c9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into wip/1588_duplicates

    Benjamin Geer committed Mar 11, 2020
    Copy the full SHA
    06a2c41 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into wip/1543-forbidden-resource

    Benjamin Geer committed Mar 11, 2020
    Copy the full SHA
    d56811c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'wip/1543-forbidden-resource' into wip/1588_duplicates

    Benjamin Geer committed Mar 11, 2020
    Copy the full SHA
    01e1eef View commit details
    Browse the repository at this point in the history

  5. refactor(gravsearch): Don't query values that the user didn't request… 

    … (ongoing).
    Benjamin Geer committed Mar 11, 2020
    Copy the full SHA
    85541cd View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2020

  1. test(gravsearch): Add client test data with paging.

    Benjamin Geer committed Mar 12, 2020
    Copy the full SHA
    40fa184 View commit details
    Browse the repository at this point in the history

  2. refactor(gravsearch): Don't query values that the user didn't request… 

    … (ongoing).
    Benjamin Geer committed Mar 12, 2020
    Copy the full SHA
    926c942 View commit details
    Browse the repository at this point in the history

  3. refactor(gravsearch): Don't query values that the user didn't request. 

    - Make E2E bug test fail again.
    Benjamin Geer committed Mar 12, 2020
    Copy the full SHA
    b7a132e View commit details
    Browse the repository at this point in the history

  4. fix(gravsearch): Merge duplicate rows in prequery results.

    Benjamin Geer committed Mar 12, 2020
    Copy the full SHA
    6bf6d43 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. refactor(gravsearch): Get rid of some vars, make things more functional.

    Benjamin Geer committed Mar 13, 2020
    Copy the full SHA
    d6a0f3a View commit details
    Browse the repository at this point in the history

  2. style(gravesearch): Rename method.

    Benjamin Geer committed Mar 13, 2020
    Copy the full SHA
    3934254 View commit details
    Browse the repository at this point in the history

  3. style(gravsearch): Fix comment.

    Benjamin Geer committed Mar 13, 2020
    Copy the full SHA
    717da58 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2020

  1. docs(gravsearch): Update design docs.

    Benjamin Geer committed Mar 20, 2020
    Copy the full SHA
    b46c4f0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'wip/1543-forbidden-resource' into wip/1588_duplicates 

    # Conflicts:
#	webapi/src/main/scala/org/knora/webapi/responders/v2/search/MainQueryResultProcessor.scala
    Benjamin Geer committed Mar 20, 2020
    Copy the full SHA
    5232359 View commit details
    Browse the repository at this point in the history

  3. docs(gravsearch): Update design docs.

    Benjamin Geer committed Mar 20, 2020
    Copy the full SHA
    8617571 View commit details
    Browse the repository at this point in the history

  4. feat(upgrade): Increment knora-base version. 

    - Simplify Gravsearch paging.
- Add design docs.
    Benjamin Geer committed Mar 20, 2020
    Copy the full SHA
    8e81c67 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'wip/1543-forbidden-resource' into wip/1588_duplicates 

    # Conflicts:
#	docs/src/paradox/05-internals/design/api-v2/gravsearch.md
    Benjamin Geer committed Mar 20, 2020
    Copy the full SHA
    c3b19cd View commit details
    Browse the repository at this point in the history

  6. test(ResourcesResponderV2): Increase timeouts.

    Benjamin Geer committed Mar 20, 2020
    Copy the full SHA
    9794698 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2020

  1. Merge branch 'develop' into wip/1588_duplicates 

    # Conflicts:
#	docs/src/paradox/05-internals/design/api-v2/gravsearch.md
#	webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala
#	webapi/src/main/scala/org/knora/webapi/responders/v2/search/MainQueryResultProcessor.scala
#	webapi/src/main/scala/org/knora/webapi/responders/v2/search/QueryTraverser.scala
#	webapi/src/main/scala/org/knora/webapi/responders/v2/search/gravsearch/prequery/AbstractPrequeryGenerator.scala
#	webapi/src/main/scala/org/knora/webapi/responders/v2/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryGenerator.scala
    Benjamin Geer committed Apr 3, 2020
    Copy the full SHA
    8993daa View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2020

  1. Merge branch 'develop' into wip/1588_duplicates 

    # Conflicts:
#	docs/src/paradox/05-internals/design/api-v2/gravsearch.md
#	webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala
#	webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala
#	webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala
#	webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala
#	webapi/src/main/scala/org/knora/webapi/util/ConstructResponseUtilV2.scala
#	webapi/src/test/scala/org/knora/webapi/util/ConstructResponseUtilV2Spec.scala
    Benjamin Geer committed Apr 8, 2020
    Copy the full SHA
    3db3a82 View commit details
    Browse the repository at this point in the history

  2. fix(gravsearch): Handle empty GROUP_CONCAT values resulting from unbo… 

    …und variables.
    Benjamin Geer committed Apr 8, 2020
    Copy the full SHA
    c7b9703 View commit details
    Browse the repository at this point in the history

  3. fix(gravsearch): Ignore empty strings in GROUP_CONCAT results.

    Benjamin Geer committed Apr 8, 2020
    Copy the full SHA
    9f38418 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2020

  1. style(gravsearch): Improve comments.

    Benjamin Geer committed Apr 9, 2020
    Copy the full SHA
    8d4fdfb View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. refactor(gravsearch): Clarify code after review.

    Benjamin Geer committed Apr 16, 2020
    Copy the full SHA
    06be757 View commit details
    Browse the repository at this point in the history