Skip to content

Commit

Permalink
Fix: Submissions filters with order_by for the same attribute (#46)
Browse files Browse the repository at this point in the history
* add get submission all including all properties test

* extract and use submission_include_params where we use submission.bring

* use retrieve_submissions helper in the :acronym/submissions endpoint

* update Goo version and add submissions filters test
  • Loading branch information
syphax-bouazzouni authored Sep 21, 2023
1 parent d8c8e5b commit bd6494c
Show file tree
Hide file tree
Showing 12 changed files with 5,714 additions and 5 deletions.
10 changes: 6 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GIT

GIT
remote: https://github.com/ontoportal-lirmm/goo.git
revision: 0c0dba92e28fd8c8261db1b3183946e0cf183b53
revision: 0019b4b7b6e18be15fe068084510c03b674d23d8
branch: development
specs:
goo (0.0.2)
Expand Down Expand Up @@ -110,6 +110,7 @@ GEM
backports (3.24.1)
bcrypt (3.1.19)
bcrypt_pbkdf (1.1.0)
benchmark-ips (2.12.0)
bigdecimal (1.4.2)
builder (3.2.4)
capistrano (3.17.3)
Expand Down Expand Up @@ -173,7 +174,7 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
googleauth (1.8.0)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
Expand Down Expand Up @@ -225,7 +226,7 @@ GEM
timeout
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-smtp (0.3.3)
net-smtp (0.4.0)
net-protocol
net-ssh (7.2.0)
netrc (0.11.0)
Expand Down Expand Up @@ -354,6 +355,7 @@ PLATFORMS
DEPENDENCIES
activesupport (~> 3.1)
bcrypt_pbkdf (>= 1.0, < 2.0)
benchmark-ips (~> 2.12)
bigdecimal (= 1.4.2)
capistrano (~> 3)
capistrano-bundler
Expand Down Expand Up @@ -405,4 +407,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
2.3.23
2.4.12
12 changes: 12 additions & 0 deletions config/solr/property_search/enumsconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" ?>
<enumsConfig>
<enum name="ontologyType">
<value>ONTOLOGY</value>
<value>VALUE_SET_COLLECTION</value>
</enum>
<enum name="propertyType">
<value>ANNOTATION</value>
<value>DATATYPE</value>
<value>OBJECT</value>
</enum>
</enumsConfig>
246 changes: 246 additions & 0 deletions config/solr/property_search/mapping-ISOLatin1Accent.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,246 @@
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# Syntax:
# "source" => "target"
# "source".length() > 0 (source cannot be empty.)
# "target".length() >= 0 (target can be empty.)

# example:
# "À" => "A"
# "\u00C0" => "A"
# "\u00C0" => "\u0041"
# "ß" => "ss"
# "\t" => " "
# "\n" => ""

# À => A
"\u00C0" => "A"

# Á => A
"\u00C1" => "A"

# Â => A
"\u00C2" => "A"

# Ã => A
"\u00C3" => "A"

# Ä => A
"\u00C4" => "A"

# Å => A
"\u00C5" => "A"

# Æ => AE
"\u00C6" => "AE"

# Ç => C
"\u00C7" => "C"

# È => E
"\u00C8" => "E"

# É => E
"\u00C9" => "E"

# Ê => E
"\u00CA" => "E"

# Ë => E
"\u00CB" => "E"

# Ì => I
"\u00CC" => "I"

# Í => I
"\u00CD" => "I"

# Î => I
"\u00CE" => "I"

# Ï => I
"\u00CF" => "I"

# IJ => IJ
"\u0132" => "IJ"

# Ð => D
"\u00D0" => "D"

# Ñ => N
"\u00D1" => "N"

# Ò => O
"\u00D2" => "O"

# Ó => O
"\u00D3" => "O"

# Ô => O
"\u00D4" => "O"

# Õ => O
"\u00D5" => "O"

# Ö => O
"\u00D6" => "O"

# Ø => O
"\u00D8" => "O"

# Œ => OE
"\u0152" => "OE"

# Þ
"\u00DE" => "TH"

# Ù => U
"\u00D9" => "U"

# Ú => U
"\u00DA" => "U"

# Û => U
"\u00DB" => "U"

# Ü => U
"\u00DC" => "U"

# Ý => Y
"\u00DD" => "Y"

# Ÿ => Y
"\u0178" => "Y"

# à => a
"\u00E0" => "a"

# á => a
"\u00E1" => "a"

# â => a
"\u00E2" => "a"

# ã => a
"\u00E3" => "a"

# ä => a
"\u00E4" => "a"

# å => a
"\u00E5" => "a"

# æ => ae
"\u00E6" => "ae"

# ç => c
"\u00E7" => "c"

# è => e
"\u00E8" => "e"

# é => e
"\u00E9" => "e"

# ê => e
"\u00EA" => "e"

# ë => e
"\u00EB" => "e"

# ì => i
"\u00EC" => "i"

# í => i
"\u00ED" => "i"

# î => i
"\u00EE" => "i"

# ï => i
"\u00EF" => "i"

# ij => ij
"\u0133" => "ij"

# ð => d
"\u00F0" => "d"

# ñ => n
"\u00F1" => "n"

# ò => o
"\u00F2" => "o"

# ó => o
"\u00F3" => "o"

# ô => o
"\u00F4" => "o"

# õ => o
"\u00F5" => "o"

# ö => o
"\u00F6" => "o"

# ø => o
"\u00F8" => "o"

# œ => oe
"\u0153" => "oe"

# ß => ss
"\u00DF" => "ss"

# þ => th
"\u00FE" => "th"

# ù => u
"\u00F9" => "u"

# ú => u
"\u00FA" => "u"

# û => u
"\u00FB" => "u"

# ü => u
"\u00FC" => "u"

# ý => y
"\u00FD" => "y"

# ÿ => y
"\u00FF" => "y"

# ff => ff
"\uFB00" => "ff"

# fi => fi
"\uFB01" => "fi"

# fl => fl
"\uFB02" => "fl"

# ffi => ffi
"\uFB03" => "ffi"

# ffl => ffl
"\uFB04" => "ffl"

# ſt => ft
"\uFB05" => "ft"

# st => st
"\uFB06" => "st"
Loading

0 comments on commit bd6494c

Please sign in to comment.