Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
419fe42
feat: updated config files and added support for custom envs
Jul 23, 2024
55b4c65
fix: added properties to elastic client init and error handling
Jul 23, 2024
6be0e44
feat: added application and the path to elastic in the config file
Jul 23, 2024
8339e03
feat: added common types
Jul 23, 2024
ddf2739
fix: added types and constants
Jul 23, 2024
c26a0f9
feat: created geotext controller
Jul 23, 2024
4301fd9
feat: created queries
Jul 23, 2024
34f75d6
feat: created geotext repository
Jul 23, 2024
d3e3311
feat: created geoTextSearchRepository
Jul 23, 2024
a92abfd
feat: created geotextSearch manager
Jul 23, 2024
7c32022
feat: created geotextSearch elasticsearch hits expected response
Jul 23, 2024
1b3509f
fix: updated import
Jul 23, 2024
c8cb61f
feat: created geotextSearch router
Jul 23, 2024
6d6cd87
feat: created geotext search interfaces
Jul 23, 2024
8811044
feat: created parsing utils
Jul 23, 2024
c277b7c
fix: changed value to right key
Jul 23, 2024
6af50f0
fix: fixed types
Jul 23, 2024
f5200cf
feat: upgraded LatLonDal
Jul 23, 2024
267c20a
delete: deleted old files because name change
Jul 23, 2024
3d01851
fix: changed value to right key
Jul 23, 2024
db872e2
fix: changed value to right key
Jul 23, 2024
3acac4e
fix: changed value to right key
Jul 23, 2024
35fde79
fix: changed value to right key
Jul 23, 2024
830de60
fix: handle types
Jul 23, 2024
efc12b0
fix: changed to V1 router
Jul 23, 2024
4760272
updated openapi schema
Jul 23, 2024
73216a3
feat: added nameTranslationsKeys, mainLanguageRegex
Jul 25, 2024
eb354b2
fix: added missing required keys and values to convertResult
Jul 25, 2024
13a049e
feat: utils created
Jul 25, 2024
c114565
fix: added missing type
Jul 25, 2024
d27df1b
feat: added dependencies
Jul 25, 2024
d27f130
delete: removed file
NivGreenstein Jul 30, 2024
ff5d9d3
feat: created dev data
NivGreenstein Jul 30, 2024
e615742
feat: updated dev script
NivGreenstein Jul 30, 2024
b5199a2
feat: update test.json
NivGreenstein Jul 30, 2024
5ba1cdb
delete: removed console.log
NivGreenstein Jul 30, 2024
78edd82
fix: updated import
NivGreenstein Jul 30, 2024
9a8f2dc
fix: removed unnecessary variable
NivGreenstein Jul 30, 2024
116338b
fix: updated HierarchySearchHit geo_json type
NivGreenstein Jul 30, 2024
9997c38
fix: updated import and removed console.log
NivGreenstein Jul 30, 2024
b28bd70
fix: updated interface name
NivGreenstein Jul 30, 2024
674ad37
fix: change docs route back to be on the main router instead under /v1
NivGreenstein Jul 30, 2024
32825c3
fix: added missing x-user-id header
NivGreenstein Jul 30, 2024
3aec2d2
feat: created GeotextSearchRequestSender
NivGreenstein Jul 30, 2024
df2fde6
feat: added mock data
NivGreenstein Jul 30, 2024
98f0d60
feat: added tests
NivGreenstein Jul 31, 2024
bcc61f0
feat(elastic): created elasticClientFactory
Aug 6, 2024
f9b2e7b
fix(containerConfig): changed elastic clients init to use factory init
Aug 6, 2024
97f6a85
fix(elastic/interfaces): changed ElasticDbClientsConfig location
Aug 6, 2024
ae14d8c
feat(elastic/utils): created queryElastic common function and additio…
Aug 6, 2024
55da584
feat(constants): added SERVICES.ELASTIC_CLIENTS
Aug 6, 2024
1736192
fix(dependencyRegistration): changed registerDependencies to be async…
Aug 6, 2024
30f17d0
delete(interfaces): removed old elastic interfaces
Aug 6, 2024
a8a1425
fix: changed function location from common/utils to elastic/utils
Aug 6, 2024
074dcac
fix(elastic): changed elasticClient to be non nullable and removed th…
Aug 6, 2024
c64a123
fix(elastic/utils): remove !client condition as it is not relevant an…
Aug 6, 2024
bd268c8
fix(geotextSearchRepository): changed queryElastic to common function…
Aug 6, 2024
a465bf1
fix: changed import location
Aug 6, 2024
9915e6f
fix(geotextSearch/utils): changed from instanceof Error to isAxiosError
Aug 6, 2024
064fd06
fix(itemRepository): changed queryElastic to common function and inje…
Aug 6, 2024
7c43b92
fix: changed import location
Aug 6, 2024
9fa1607
fix: additionalControlSearchProperties requests config
Aug 6, 2024
84f3207
fix(itemRepository): added config to additionalControlSearchProperties
Aug 6, 2024
98331de
feat: added logger injection to latLonRepository
Aug 6, 2024
e6dacc6
fix(routeRepository): added config to additionalControlSearchProperti…
Aug 6, 2024
5626e6b
fix(tileRepository): added config to additionalControlSearchPropertie…
Aug 6, 2024
b1a6d0c
fix: boundary, source, regions changed to be filter and fixed coding …
Aug 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions config/custom-environment-variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,72 @@
}
}
}
},
"db": {
"elastic": {
"control": {
"node": "ELASTIC_CONTROL_URL",
"auth": {
"username": "ELASTIC_CONTROL_USERNAME",
"password": "ELASTIC_CONTROL_PASSWORD"
},
"properties": {
"index": "ELASTIC_CONTROL_INDEX"
}
},
"geotext": {
"node": "ELASTIC_GEOTEXT_URL",
"auth": {
"username": "ELASTIC_GEOTEXT_USERNAME",
"password": "ELASTIC_GEOTEXT_PASSWORD"
},
"properties": {
"index": {
"geotext": "ELASTIC_GEOTEXT_DATA_INDEX",
"placetypes": "ELASTIC_GEOTEXT_PLACETYPES_INDEX",
"hierarchies": "ELASTIC_GEOTEXT_HIERARCHIES_INDEX"
},
"textTermLanguage": "ELASTIC_GEOTEXT_TEXT_TERM_LANGUAGE"
}
}
},
"postgresql": {
"host": "POSTGRES_URL",
"port": {
"__name": "POSTGRES_PORT",
"__format": "number"
},
"username": "POSTGRES_USERNAME",
"password": "POSTGRES_PASSWORD",
"enableSslAuth": {
"__name": "POSTGRES_ENABLE_SLL_AUTH",
"__format": "boolean"
},
"sslPaths": {
"ca": "POSTGRES_CA_PATH",
"key": "POSTGRES_KEY_PATH",
"cert": "POSTGRES_CERT_PATH"
},
"database": "POSTGRES_DB_NAME",
"schema": "POSTGRES_DB_SCHEMA"
}
},
"application": {
"services": {
"tokenTypesUrl": "TOKEN_TYPE_URL"
},
"sources": {
"__name": "GEOTEXT_SOURCES",
"__format": "json"
},
"regions": {
"__name": "REGIONS",
"__format": "json"
},
"nameTranslationsKeys": {
"__name": "NAME_TRANSLATION_KEYS",
"__format": "json"
},
"mainLanguageRegex": "MAIN_LANGUAGE_REGEX"
}
}
50 changes: 35 additions & 15 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,33 @@
},
"db": {
"elastic": {
"searchy": {
"control": {
"node": "http://localhost:9200",
"auth": {
"username": "elastic",
"password": "changeme"
"username": "control",
"password": "password"
},
"requestTimeout": 60000,
"properties": {
"index": "control_gil_v5",
"size": 3
"index": "control_index",
"defaultResponseLimit": 3
}
},
"nlp": {
"geotext": {
"node": "http://localhost:9200",
"auth": {
"username": "elastic",
"password": "changeme"
"username": "geotext",
"password": "password"
},
"requestTimeout": 60000,
"properties": {
"index": "nlp_gil_v5",
"size": 3
"index": {
"geotext": "geotext_index",
"placetypes": "placetypes_index",
"hierarchies": "hierarchies_index"
},
"defaultResponseLimit": 3,
"textTermLanguage": "en"
}
}
},
Expand All @@ -68,9 +73,24 @@
"schema": "geocoder"
}
},
"services": {
"placeTypeUrl": "http://example.com",
"tokenTypesUrl": "http://example.com"
},
"cronLoadTileLatLonDataPattern": "0 * * * *"
"application": {
"services": {
"tokenTypesUrl": "http://NLP_ANALYSES"
},
"cronLoadTileLatLonDataPattern": "0 * * * *",
"elasticQueryBoosts": {
"name": 1.1,
"placeType": 1.1,
"subPlaceType": 1.1,
"hierarchy": 1.1,
"viewbox": 1.1
},
"sources": {
"SOURCE_A": "a",
"SOURCE_B": "b"
},
"regions": {},
"nameTranslationsKeys": ["en", "fr"],
"mainLanguageRegex": "[a-zA-Z]"
}
}
40 changes: 33 additions & 7 deletions config/test.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
{
"db": {
"elastic": {
"searchy": {
"control": {
"node": "http://localhost:9200",
"auth": {
"username": "elastic",
"password": "changeme"
},
"requestTimeout": 60000,
"properties": {
"index": "control_gil_v5",
"size": 3
"index": "control_index",
"defaultResponseLimit": 3
}
},
"nlp": {
"geotext": {
"node": "http://localhost:9200",
"auth": {
"username": "elastic",
"password": "changeme"
},
"requestTimeout": 60000,
"properties": {
"index": "nlp_gil_v5",
"size": 3
"index": {
"geotext": "geotext_index",
"placetypes": "placetypes_index",
"hierarchies": "hierarchies_index"
},
"defaultResponseLimit": 3,
"textTermLanguage": "en"
}
}
},
Expand All @@ -39,7 +44,28 @@
"cert": ""
},
"database": "postgres",
"schema": "geocoder_test"
"schema": "geocoder"
}
},
"application": {
"services": {
"tokenTypesUrl": "http://localhost:5001/NLP_ANALYSES"
},
"cronLoadTileLatLonDataPattern": "0 * * * *",
"elasticQueryBoosts": {
"name": 1.1,
"placeType": 1.1,
"subPlaceType": 1.1,
"hierarchy": 1.1,
"viewbox": 1.1
},
"sources": {
"OSM": "OSM"
},
"regions": {
"USA": ["New York", "Los Angeles"]
},
"nameTranslationsKeys": ["en", "fr"],
"mainLanguageRegex": "[a-zA-Z]"
}
}
Loading