Skip to content

Extract ES index names as constants #257

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

Merged
JohnKallies merged 1 commit into from
Nov 29, 2022
Merged

Extract ES index names as constants #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion api/src/main/kotlin/edu/wgu/osmt/collection/CollectionDoc.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package edu.wgu.osmt.collection
import com.fasterxml.jackson.annotation.JsonIgnore
import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.annotation.JsonProperty
import edu.wgu.osmt.config.INDEX_COLLECTION_DOC
import edu.wgu.osmt.db.PublishStatus
import org.elasticsearch.core.Nullable
import org.springframework.data.annotation.Id
Expand All @@ -15,7 +16,7 @@ import java.time.LocalDateTime
* Also corresponds to `CollectionSummary` API response object
*/
@JsonInclude(value = JsonInclude.Include.NON_NULL)
@Document(indexName = "collection_v1", createIndex = true)
@Document(indexName = INDEX_COLLECTION_DOC, createIndex = true)
@Setting(settingPath = "/elasticsearch/settings.json")
data class CollectionDoc(
@Field(name = "db_id")
Expand Down
10 changes: 9 additions & 1 deletion api/src/main/kotlin/edu/wgu/osmt/config/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
package edu.wgu.osmt.config

const val UNAUTHENTICATED_USERNAME = "unauthenticated"
const val UNAUTHENTICATED_USERNAME = "unauthenticated"



// ElasticSearch Index Names
const val INDEX_RICHSKILL_DOC = "richskill_v1"
const val INDEX_COLLECTION_DOC = "collection_v1"
const val INDEX_JOBCODE_DOC = "jobcode_v1"
const val INDEX_KEYWORD_DOC = "keyword"
3 changes: 2 additions & 1 deletion api/src/main/kotlin/edu/wgu/osmt/jobcode/JobCode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package edu.wgu.osmt.jobcode

import com.fasterxml.jackson.annotation.JsonIgnore
import edu.wgu.osmt.config.INDEX_JOBCODE_DOC
import edu.wgu.osmt.db.DatabaseData
import org.elasticsearch.core.Nullable
import org.springframework.data.elasticsearch.annotations.*
import java.time.LocalDateTime
import java.time.ZoneOffset

@Document(indexName = "jobcode_v1", createIndex = true)
@Document(indexName = INDEX_JOBCODE_DOC, createIndex = true)
@Setting(settingPath = "/elasticsearch/settings.json")
data class JobCode(
@Field
Expand Down
3 changes: 2 additions & 1 deletion api/src/main/kotlin/edu/wgu/osmt/keyword/Keyword.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package edu.wgu.osmt.keyword

import edu.wgu.osmt.config.INDEX_KEYWORD_DOC
import edu.wgu.osmt.db.*
import org.elasticsearch.core.Nullable
import org.jetbrains.exposed.dao.id.LongIdTable
Expand All @@ -9,7 +10,7 @@ import org.springframework.data.annotation.Id
import org.springframework.data.elasticsearch.annotations.*
import java.time.LocalDateTime

@Document(indexName = "keyword", createIndex = true)
@Document(indexName = INDEX_KEYWORD_DOC, createIndex = true)
@Setting(settingPath = "/elasticsearch/settings.json")
data class Keyword(
@Id
Expand Down
3 changes: 2 additions & 1 deletion api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillDoc.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.annotation.JsonProperty
import edu.wgu.osmt.collection.CollectionDoc
import edu.wgu.osmt.config.AppConfig
import edu.wgu.osmt.config.INDEX_RICHSKILL_DOC
import edu.wgu.osmt.db.PublishStatus
import edu.wgu.osmt.jobcode.JobCode
import edu.wgu.osmt.keyword.KeywordTypeEnum
Expand All @@ -19,7 +20,7 @@ import java.time.LocalDateTime
* Elasticsearch representation of a Rich Skill.
* Also corresponds to `SkillSummary` API response object
*/
@Document(indexName = "richskill_v1", createIndex = true, versionType = Document.VersionType.EXTERNAL)
@Document(indexName = INDEX_RICHSKILL_DOC, createIndex = true, versionType = Document.VersionType.EXTERNAL)
@Setting(settingPath = "/elasticsearch/settings.json")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
data class RichSkillDoc(
Expand Down