[Dependent on PR-340] OSMT-301: Added ability to set multiple authors for an RSD

api/src/main/kotlin/edu/wgu/osmt/api/model/ApiSkill.kt

@@ -26,8 +26,8 @@ class ApiSkill(private val rsd: RichSkillDescriptor, private val cs: Set<Collect
         get() = appConfig.defaultCreatorUri
 
     @get:JsonProperty
-    val author: String?
-        get() = rsd.author?.let { it.value }
+    val authors: List<String>
+        get() = rsd.authors.mapNotNull { it.value }
 
     @get:JsonProperty
     val status: PublishStatus

api/src/main/kotlin/edu/wgu/osmt/api/model/ApiSkillUpdate.kt

@@ -19,8 +19,8 @@ data class ApiSkillUpdate(
     @JsonProperty("collections")
     val collections: ApiStringListUpdate? = null,
 
-    @JsonProperty("author")
-    val author: String? = null,
+    @JsonProperty("authors")
+    val authors: ApiStringListUpdate? = null,
 
     @JsonProperty("keywords")
     val keywords: ApiStringListUpdate? = null,

api/src/main/kotlin/edu/wgu/osmt/csv/BatchImportRichSkill.kt

@@ -58,8 +58,8 @@ class RichSkillRow: CsvRow {
     @CsvBindByName(column = "O*NET Job Role")
     var jobRoles: String? = null
 
-    @CsvBindByName(column = "Author")
-    var author: String? = null
+    @CsvBindByName(column = "Authors")
+    var authors: String? = null
 
     @CsvBindByName(column = "Employer")
     var employer: String? = null
@@ -135,6 +135,7 @@ class BatchImportRichSkill: CsvImport<RichSkillRow> {
 
         for (row in rows) transaction {
             var category: KeywordDao? = null
+            var authors: List<KeywordDao>? = null
             var keywords: List<KeywordDao>? = null
             var standards: List<KeywordDao>? = null
             var certifications: List<KeywordDao>? = null
@@ -159,12 +160,18 @@ class BatchImportRichSkill: CsvImport<RichSkillRow> {
             blsDetailed = parseJobCodes(row.blsDetaileds, JobCodeBreakout::detailedCode)
             occupations = parseJobCodes(row.jobRoles, JobCodeBreakout::jobRoleCode)
             collections = parseCollections(row.collections)
+            authors = parseKeywords(KeywordTypeEnum.Author, row.authors)
+
+            // If no Authors set to default Author
+            if (authors.isNullOrEmpty()) {
+                authors = listOf(keywordRepository.getDefaultAuthor())
+            }
 
             if (row.alignmentTitle != null || row.alignmentUri != null) {
                 alignments = listOf( keywordRepository.findOrCreate(KeywordTypeEnum.Alignment, value = row.alignmentTitle, uri = row.alignmentUri) ).filterNotNull()
             }
 
-            val allKeyWords = concatenate(keywords, standards, certifications, employers, alignments)
+            val allKeyWords = concatenate(keywords, authors, standards, certifications, employers, alignments)
             val allJobcodes = concatenate(blsMajor,blsMinor,blsBroad,blsDetailed,occupations)
 
             if (row.skillName != null && row.skillStatement != null) {
@@ -175,7 +182,6 @@ class BatchImportRichSkill: CsvImport<RichSkillRow> {
                     keywords = allKeyWords?.let { ListFieldUpdate(add = it) },
                     collections = collections?.let {ListFieldUpdate(add = it)},
                     jobCodes = allJobcodes?.let { ListFieldUpdate(add = it) },
-                    author = NullableFieldUpdate(keywordRepository.getDefaultAuthor())
                 ), user)
                 log.info("created skill '${row.skillName!!}'")
             }

api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillCsvExport.kt

@@ -15,7 +15,7 @@ class RichSkillCsvExport(
         val columns = arrayOf(
             CsvColumn<RichSkillAndCollections>("Canonical URL") { it.rs.canonicalUrl(appConfig.baseUrl) },
             CsvColumn("RSD Name") { it.rs.name },
-            CsvColumn("Author") { it.rs.author?.value ?: "" },
+            CsvColumn("Authors") { it.rs.authors.map { author -> author.value ?: "" }.joinToString(listDelimiter) },
             CsvColumn("Skill Statement") { it.rs.statement },
             CsvColumn("Category") { it.rs.category?.value ?: "" },
             CsvColumn("Keywords") { it.rs.searchingKeywords.map { keyword -> keyword.value ?: "" }.joinToString(listDelimiter) },

api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillDescriptor.kt

@@ -29,13 +29,15 @@ data class RichSkillDescriptor(
     val jobCodes: List<JobCode> = listOf(),
     val keywords: List<Keyword> = listOf(),
     val category: Keyword? = null,
-    val author: Keyword? = null,
     override val archiveDate: LocalDateTime? = null,
     override val publishDate: LocalDateTime? = null,
     val collections: List<Collection> = listOf()
 ) : DatabaseData, HasUpdateDate, PublishStatusDetails {
 
     // Keyword collections
+    val authors: List<Keyword>
+        get() = this.keywords.filter { it.type == KeywordTypeEnum.Author }
+
     val certifications: List<Keyword>
         get() = this.keywords.filter { it.type == KeywordTypeEnum.Certification }
 
@@ -77,7 +79,7 @@ fun RichSkillDescriptor.diff(old: RichSkillDescriptor?): List<Change> {
         Comparison(RichSkillDescriptor::name.name, RichSkillDescriptorComparisons::compareName, old, new),
         Comparison(RichSkillDescriptor::statement.name, RichSkillDescriptorComparisons::compareStatement, old, new),
         Comparison(RichSkillDescriptor::category.name, RichSkillDescriptorComparisons::compareCategory, old, new),
-        Comparison(RichSkillDescriptor::author.name, RichSkillDescriptorComparisons::compareAuthor, old, new),
+        Comparison(RichSkillDescriptor::authors.name, RichSkillDescriptorComparisons::compareAuthors, old, new),
         Comparison(
             RichSkillDescriptor::publishStatus.name,
             RichSkillDescriptorComparisons::comparePublishStatus,
@@ -110,7 +112,6 @@ data class RsdUpdateObject(
     override val id: Long? = null,
     val name: String? = null,
     val statement: String? = null,
-    val author: NullableFieldUpdate<KeywordDao>? = null,
     val category: NullableFieldUpdate<KeywordDao>? = null,
     val keywords: ListFieldUpdate<KeywordDao>? = null,
     val jobCodes: ListFieldUpdate<JobCodeDao>? = null,
@@ -125,11 +126,6 @@ data class RsdUpdateObject(
                     validate(KeywordDao::type).isEqualTo(KeywordTypeEnum.Category)
                 }
             }
-            validate(RsdUpdateObject::author).validate {
-                validate(NullableFieldUpdate<KeywordDao>::t).validate {
-                    validate(KeywordDao::type).isEqualTo(KeywordTypeEnum.Author)
-                }
-            }
         }
     }
 
@@ -146,13 +142,6 @@ data class RsdUpdateObject(
                 dao.category = null
             }
         }
-        author?.let {
-            if (it.t != null) {
-                dao.author = it.t
-            } else {
-                dao.author = null
-            }
-        }
         applyKeywords()
         applyJobCodes()
         applyCollections()
@@ -219,8 +208,8 @@ object RichSkillDescriptorComparisons {
         return r.category?.value
     }
 
-    fun compareAuthor(r: RichSkillDescriptor): String? {
-        return r.author?.value
+    fun compareAuthors(receiver: RichSkillDescriptor): String? {
+        return keywordsCompare(receiver, RichSkillDescriptor::authors)
     }
 
     fun comparePublishStatus(r: RichSkillDescriptor): String {

api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillDescriptorDao.kt

@@ -24,7 +24,6 @@ class RichSkillDescriptorDao(id: EntityID<Long>) : LongEntity(id), OutputsModel<
     var uuid: String by RichSkillDescriptorTable.uuid
     var name: String by RichSkillDescriptorTable.name
     var statement: String by RichSkillDescriptorTable.statement
-    var author by KeywordDao optionalReferencedOn RichSkillDescriptorTable.author
 
     var jobCodes by JobCodeDao via RichSkillJobCodes
 
@@ -45,7 +44,6 @@ class RichSkillDescriptorDao(id: EntityID<Long>) : LongEntity(id), OutputsModel<
             jobCodes = jobCodes.map { it.toModel() }.sortedBy { it.code },
             keywords = keywords.map { it.toModel() }.sortedBy { it.id!! },
             category = category?.toModel(),
-            author = author?.toModel(),
             archiveDate = archiveDate,
             publishDate = publishDate,
             collections = collections.map { it.toModel() }.toList().sortedBy { it.name }

api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillDescriptorTable.kt

@@ -29,12 +29,6 @@ object RichSkillDescriptorTable : LongIdTable("RichSkillDescriptor"), TableWithU
         onDelete = ReferenceOption.RESTRICT,
         onUpdate = ReferenceOption.CASCADE
     ).nullable()
-    val author = reference(
-        "author_id",
-        KeywordTable,
-        onDelete = ReferenceOption.RESTRICT,
-        onUpdate = ReferenceOption.CASCADE
-    ).nullable()
 }
 
 // many-to-many table for RichSkillDescriptor and JobCode relationship

api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillDoc.kt

@@ -76,7 +76,6 @@ data class RichSkillDoc(
     @get:JsonProperty
     val category: String? = null,
 
-    @Nullable
     @MultiField(
         mainField = Field(type = Text, analyzer = "english_stemmer"),
         otherFields = [
@@ -85,8 +84,8 @@ data class RichSkillDoc(
             InnerField(suffix = "keyword", type = Keyword)
         ]
     )
-    @get:JsonProperty("author")
-    val author: String? = null,
+    @get:JsonProperty("authors")
+    val authors: List<String> = listOf(),
 
     @Field(type = Keyword)
     @get:JsonProperty("status")
@@ -172,7 +171,7 @@ data class RichSkillDoc(
                 name = dao.name,
                 statement = dao.statement,
                 category = dao.category?.value,
-                author = dao.author?.value,
+                authors = dao.keywords.filter { it.type == KeywordTypeEnum.Author }.mapNotNull { it.value },
                 publishStatus = dao.publishStatus(),
                 searchingKeywords = dao.keywords.filter { it.type == KeywordTypeEnum.Keyword }.mapNotNull { it.value },
                 jobCodes = dao.jobCodes.map { it.toModel() },

api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillEsRepo.kt

@@ -110,9 +110,9 @@ class CustomRichSkillQueriesImpl @Autowired constructor(override val elasticSear
             }
             author.nullIfEmpty()?.let {
                 if (it.contains("\"")) {
-                    bq.must(simpleQueryStringQuery(it).field("${RichSkillDoc::author.name}.raw").defaultOperator(Operator.AND))
+                    bq.must(simpleQueryStringQuery(it).field("${RichSkillDoc::authors.name}.raw").defaultOperator(Operator.AND))
                 } else {
-                    bq.must(matchBoolPrefixQuery(RichSkillDoc::author.name, it))
+                    bq.must(matchBoolPrefixQuery(RichSkillDoc::authors.name, it))
                 }
             }
             skillStatement.nullIfEmpty()?.let {
@@ -231,7 +231,7 @@ class CustomRichSkillQueriesImpl @Autowired constructor(override val elasticSear
                 }
             }
             authors?. let {
-                bq.must(buildNestedQueries(RichSkillDoc::author.name, it))
+                bq.must(buildNestedQueries(RichSkillDoc::authors.name, it))
             }
             occupations?.let {
                 it.mapNotNull { value ->
@@ -264,7 +264,7 @@ class CustomRichSkillQueriesImpl @Autowired constructor(override val elasticSear
                 .defaultOperator(Operator.AND),
             simpleQueryStringQuery(query).field("${RichSkillDoc::employers.name}.raw").defaultOperator(Operator.AND),
             simpleQueryStringQuery(query).field("${RichSkillDoc::alignments.name}.raw").defaultOperator(Operator.AND),
-            simpleQueryStringQuery(query).field("${RichSkillDoc::author.name}.raw").defaultOperator(Operator.AND)
+            simpleQueryStringQuery(query).field("${RichSkillDoc::authors.name}.raw").defaultOperator(Operator.AND)
         )
 
         val queries = listOf(
@@ -276,7 +276,7 @@ class CustomRichSkillQueriesImpl @Autowired constructor(override val elasticSear
             matchPhrasePrefixQuery(RichSkillDoc::certifications.name, query),
             matchPhrasePrefixQuery(RichSkillDoc::employers.name, query),
             matchPhrasePrefixQuery(RichSkillDoc::alignments.name, query),
-            matchPhrasePrefixQuery(RichSkillDoc::author.name, query)
+            matchPhrasePrefixQuery(RichSkillDoc::authors.name, query)
         )
 
         if (isComplex) {

api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillRepository.kt

@@ -143,7 +143,6 @@ class RichSkillRepositoryImpl @Autowired constructor(
             this.updateDate = LocalDateTime.now(ZoneOffset.UTC)
             this.creationDate = LocalDateTime.now(ZoneOffset.UTC)
             this.uuid = UUID.randomUUID().toString()
-            this.author = updateObject.author?.t
             this.category = updateObject.category?.t
         }
 
@@ -203,17 +202,14 @@ class RichSkillRepositoryImpl @Autowired constructor(
     }
 
     override fun rsdUpdateFromApi(skillUpdate: ApiSkillUpdate, user: String, email: String): RsdUpdateObject {
-        val authorKeyword = skillUpdate.author?.let {
-            keywordRepository.findOrCreate(KeywordTypeEnum.Author, value = it)
-        }
-
         val categoryKeyword = skillUpdate.category?.let {
             keywordRepository.findOrCreate(KeywordTypeEnum.Category, value = it)
         }
 
-
         val addingCollections = mutableListOf<CollectionDao>()
         val removingCollections = mutableListOf<CollectionDao>()
+        val addingAuthors = mutableListOf<KeywordDao>()
+        val removingAuthors = mutableListOf<KeywordDao>()
         val addingKeywords = mutableListOf<KeywordDao>()
         val removingKeywords = mutableListOf<KeywordDao>()
         val jobsToAdd = mutableListOf<JobCodeDao>()
@@ -285,6 +281,7 @@ class RichSkillRepositoryImpl @Autowired constructor(
             }?.let { jobsToRemove.addAll(it.filterNotNull()) }
         }
 
+        skillUpdate.authors?.let { lookupKeywords(it, KeywordTypeEnum.Author) }
         skillUpdate.keywords?.let { lookupKeywords(it, KeywordTypeEnum.Keyword) }
         skillUpdate.certifications?.let { lookupReferences(it, KeywordTypeEnum.Certification) }
         skillUpdate.standards?.let { lookupAlignments(it, KeywordTypeEnum.Standard) }
@@ -314,7 +311,6 @@ class RichSkillRepositoryImpl @Autowired constructor(
             name = skillUpdate.skillName,
             statement = skillUpdate.skillStatement,
             publishStatus = skillUpdate.publishStatus,
-            author = authorKeyword?.let { NullableFieldUpdate(it) },
             category = if (skillUpdate.category != null || skillUpdate.category?.isBlank() == true) NullableFieldUpdate(
                 categoryKeyword
             ) else null,

api/src/main/resources/db/migration/V2023.02.20__richskill-multiple-authors.sql

@@ -0,0 +1,19 @@
+USE osmt_db;
+
+--
+-- Migration of RichSkillDescriptor.author_id to RichSkillKeywords table.
+--
+
+INSERT INTO RichSkillKeywords (richskill_id, keyword_id)
+SELECT id, author_id
+FROM RichSkillDescriptor
+WHERE RichSkillDescriptor.author_id is not null;
+
+--
+-- Removal of 'author_id' from RichSkillDescriptor table.
+--
+
+ALTER TABLE `RichSkillDescriptor`
+    DROP FOREIGN KEY `fk_RichSkillDescriptor_author_id_id`,
+    DROP COLUMN `author_id`
+;

api/src/test/kotlin/edu/wgu/osmt/TestObjectHelpers.kt

@@ -80,7 +80,7 @@ object TestObjectHelpers {
             name = randomString(),
             statement = randomString(),
             category = randomString(),
-            author = randomString()
+            authors = listOf(randomString())
         ).copy(
             searchingKeywords = randomStrings(),
             standards = randomStrings(),
@@ -97,7 +97,7 @@ object TestObjectHelpers {
         name: String,
         statement: String,
         category: String? = "default category",
-        author: String = authorString,
+        authors: List<String> = listOf(authorString),
         publishStatus: PublishStatus = PublishStatus.Draft
     ): RichSkillDoc {
         val uuid = UUID.randomUUID().toString()
@@ -108,7 +108,7 @@ object TestObjectHelpers {
             name = name,
             statement = statement,
             category = category,
-            author = author,
+            authors = authors,
             publishStatus = publishStatus,
             collections = listOf(collectionDoc(elasticIdCounter, UUID.randomUUID().toString(), randomString()))
         )
@@ -165,8 +165,10 @@ object TestObjectHelpers {
         val skillStatement = statement ?: UUID.randomUUID().toString()
         val categoryName = UUID.randomUUID().toString()
         val categoryDescription = UUID.randomUUID().toString()
-        val author = UUID.randomUUID().toString()
 
+        val authors = ApiStringListUpdate(
+            add = (1..keywordCount).toList().map { UUID.randomUUID().toString() }
+        )
         val keywords = ApiStringListUpdate(
             add = (1..keywordCount).toList().map { UUID.randomUUID().toString() }
         )
@@ -195,7 +197,7 @@ object TestObjectHelpers {
             skillStatement = skillStatement,
             publishStatus = publishStatus,
             category = categoryName,
-            author = author,
+            authors = authors,
             keywords = keywords,
             certifications = certifications,
             standards = standards,

api/src/test/kotlin/edu/wgu/osmt/api/model/ApiSkillTest.kt

@@ -30,7 +30,6 @@ internal class ApiSkillTest {
 
         // Assert
         Assertions.assertThat(mockData.appConfig.defaultCreatorUri).isEqualTo(actual.creator)
-        Assertions.assertThat(rsd.author?.value).isEqualTo(actual.author)
         Assertions.assertThat(rsd.publishStatus()).isEqualTo(actual.status)
         Assertions.assertThat(rsd.creationDate).isEqualTo(actual.creationDate.toLocalDateTime())
         Assertions.assertThat(rsd.updateDate).isEqualTo(actual.updateDate.toLocalDateTime())