diff --git a/api/src/main/kotlin/edu/wgu/osmt/collection/CollectionDoc.kt b/api/src/main/kotlin/edu/wgu/osmt/collection/CollectionDoc.kt index 96a17b84c..8268cab80 100644 --- a/api/src/main/kotlin/edu/wgu/osmt/collection/CollectionDoc.kt +++ b/api/src/main/kotlin/edu/wgu/osmt/collection/CollectionDoc.kt @@ -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 @@ -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") diff --git a/api/src/main/kotlin/edu/wgu/osmt/config/Constants.kt b/api/src/main/kotlin/edu/wgu/osmt/config/Constants.kt index 5c97fb95d..4d2cbd1e8 100644 --- a/api/src/main/kotlin/edu/wgu/osmt/config/Constants.kt +++ b/api/src/main/kotlin/edu/wgu/osmt/config/Constants.kt @@ -1,3 +1,11 @@ package edu.wgu.osmt.config -const val UNAUTHENTICATED_USERNAME = "unauthenticated" \ No newline at end of file +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" diff --git a/api/src/main/kotlin/edu/wgu/osmt/jobcode/JobCode.kt b/api/src/main/kotlin/edu/wgu/osmt/jobcode/JobCode.kt index a41ec2535..f00bcb7ca 100644 --- a/api/src/main/kotlin/edu/wgu/osmt/jobcode/JobCode.kt +++ b/api/src/main/kotlin/edu/wgu/osmt/jobcode/JobCode.kt @@ -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 diff --git a/api/src/main/kotlin/edu/wgu/osmt/keyword/Keyword.kt b/api/src/main/kotlin/edu/wgu/osmt/keyword/Keyword.kt index 16497659f..f19887580 100644 --- a/api/src/main/kotlin/edu/wgu/osmt/keyword/Keyword.kt +++ b/api/src/main/kotlin/edu/wgu/osmt/keyword/Keyword.kt @@ -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 @@ -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 diff --git a/api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillDoc.kt b/api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillDoc.kt index 704134f27..670119264 100644 --- a/api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillDoc.kt +++ b/api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillDoc.kt @@ -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 @@ -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(