Provide my workspace feature to users

api/src/main/kotlin/edu/wgu/osmt/RoutePaths.kt

@@ -32,6 +32,7 @@ object RoutePaths {
     const val COLLECTION_CSV = "$COLLECTION_DETAIL/csv"
     const val COLLECTION_REMOVE = "$COLLECTION_DETAIL/remove"
 
+    const val WORKSPACE_PATH = "$API/workspace"
 
     const val TASKS_PATH = "$API/results"
     const val TASK_DETAIL_TEXT = "$TASKS_PATH/text/{uuid}"

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

@@ -40,8 +40,8 @@ class ApiCollection(private val collection: Collection, private val ss: List<Ric
         get() = collection.author?.let { it.value }
 
     @get:JsonProperty
-    val status: PublishStatus
-        get() = collection.publishStatus()
+    val status: PublishStatus?
+        get() = collection.status
 
     @get:JsonProperty
     val creationDate: ZonedDateTime
@@ -63,6 +63,10 @@ class ApiCollection(private val collection: Collection, private val ss: List<Ric
     val skills: List<ApiSkillSummary>
         get() = ss.map { ApiSkillSummary.fromSkill(it, appConfig) }
 
+    @get:JsonProperty
+    val owner: String?
+        get() = collection.workspaceOwner
+
     companion object {
         fun fromDao(collectionDao: CollectionDao, appConfig: AppConfig): ApiCollection {
             return ApiCollection(collectionDao.toModel(), collectionDao.skills.map{ it.toModel() }, appConfig)

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

@@ -1,12 +1,14 @@
 package edu.wgu.osmt.api.model
 
+import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.annotation.JsonProperty
 import edu.wgu.osmt.db.PublishStatus
 
 data class ApiCollectionUpdate(
     @JsonProperty("name")
     val name: String? = null,
 
+    @JsonFormat(with= [JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES])
     @JsonProperty("status")
     val publishStatus: PublishStatus? = null,
 

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

@@ -110,7 +110,7 @@ class ApiSkill(private val rsd: RichSkillDescriptor, private val cs: Set<Collect
 
     companion object {
         fun fromDao(rsdDao: RichSkillDescriptorDao, appConfig: AppConfig): ApiSkill{
-            return ApiSkill(rsdDao.toModel(), rsdDao.collections.map{ it.toModel() }.toSet(), appConfig)
+            return ApiSkill(rsdDao.toModel(), rsdDao.collections.map{ it.toModel() }.filter { !it.isWorkspace() }.toSet(), appConfig)
         }
     }
 }

api/src/main/kotlin/edu/wgu/osmt/collection/Collection.kt

@@ -7,6 +7,7 @@ import edu.wgu.osmt.keyword.Keyword
 import edu.wgu.osmt.keyword.KeywordDao
 import edu.wgu.osmt.keyword.KeywordTypeEnum
 import edu.wgu.osmt.richskill.RichSkillDescriptorDao
+import org.apache.commons.lang3.StringUtils
 import org.valiktor.functions.isEqualTo
 import org.valiktor.functions.validate
 import org.valiktor.validate
@@ -20,11 +21,17 @@ data class Collection(
     val uuid: String,
     val name: String,
     val author: Keyword? = null,
+    val workspaceOwner: String? = null,
+    val status: PublishStatus,
     override val archiveDate: LocalDateTime? = null,
     override val publishDate: LocalDateTime? = null
 ) : DatabaseData, HasUpdateDate, PublishStatusDetails {
 
     fun canonicalUrl(baseUrl: String): String = "$baseUrl/api/collections/${uuid}"
+
+    fun isWorkspace() : Boolean {
+        return  (this.status == PublishStatus.Workspace && StringUtils.isNotEmpty(this.workspaceOwner))
+    }
 }
 
 data class CollectionUpdateObject(

api/src/main/kotlin/edu/wgu/osmt/collection/CollectionController.kt

@@ -7,11 +7,13 @@ import edu.wgu.osmt.api.model.ApiCollection
 import edu.wgu.osmt.api.model.ApiCollectionUpdate
 import edu.wgu.osmt.api.model.ApiSearch
 import edu.wgu.osmt.api.model.ApiSkillListUpdate
+import edu.wgu.osmt.api.model.ApiStringListUpdate
 import edu.wgu.osmt.api.model.CollectionSortEnum
 import edu.wgu.osmt.auditlog.AuditLog
 import edu.wgu.osmt.auditlog.AuditLogRepository
 import edu.wgu.osmt.auditlog.AuditLogSortEnum
 import edu.wgu.osmt.config.AppConfig
+import edu.wgu.osmt.config.DEFAULT_WORKSPACE_NAME
 import edu.wgu.osmt.db.PublishStatus
 import edu.wgu.osmt.elasticsearch.OffsetPageable
 import edu.wgu.osmt.richskill.RichSkillRepository
@@ -97,7 +99,9 @@ class CollectionController @Autowired constructor(
     ): List<ApiCollection> {
         return collectionRepository.createFromApi(
             apiCollectionUpdates,
-            richSkillRepository, oAuthHelper.readableUsername(user)
+            richSkillRepository,
+            oAuthHelper.readableUserName(user),
+            oAuthHelper.readableUserIdentifier(user)
         ).map {
             ApiCollection.fromDao(it, appConfig)
         }
@@ -122,14 +126,13 @@ class CollectionController @Autowired constructor(
         val updated = collectionRepository.updateFromApi(
             existing.id.value,
             apiUpdate,
-            richSkillRepository, oAuthHelper.readableUsername(user)
+            richSkillRepository, oAuthHelper.readableUserName(user)
         )
             ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
 
         return ApiCollection.fromDao(updated, appConfig)
     }
 
-
     @PostMapping(RoutePaths.COLLECTION_SKILLS_UPDATE, produces = [MediaType.APPLICATION_JSON_VALUE])
     @ResponseBody
     fun updateSkills(
@@ -142,7 +145,7 @@ class CollectionController @Autowired constructor(
         @AuthenticationPrincipal user: Jwt?
     ): HttpEntity<TaskResult> {
         val publishStatuses = status.mapNotNull { PublishStatus.forApiValue(it) }.toSet()
-        val task = UpdateCollectionSkillsTask(uuid, skillListUpdate, publishStatuses=publishStatuses, userString = oAuthHelper.readableUsername(user))
+        val task = UpdateCollectionSkillsTask(uuid, skillListUpdate, publishStatuses=publishStatuses, userString = oAuthHelper.readableUserName(user))
 
         taskMessageService.enqueueJob(TaskMessageService.updateCollectionSkills, task)
         return Task.processingResponse(task)
@@ -164,7 +167,7 @@ class CollectionController @Autowired constructor(
     ): HttpEntity<TaskResult> {
         val filterStatuses = filterByStatus.mapNotNull { PublishStatus.forApiValue(it) }.toSet()
         val publishStatus = PublishStatus.forApiValue(newStatus) ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST)
-        val task = PublishTask(AppliesToType.Collection, search, filterByStatus=filterStatuses, publishStatus = publishStatus, userString = oAuthHelper.readableUsername(user))
+        val task = PublishTask(AppliesToType.Collection, search, filterByStatus=filterStatuses, publishStatus = publishStatus, userString = oAuthHelper.readableUserName(user))
 
         taskMessageService.enqueueJob(TaskMessageService.publishSkills, task)
         return Task.processingResponse(task)
@@ -174,7 +177,7 @@ class CollectionController @Autowired constructor(
     fun getSkillsForCollectionCsv(
         @PathVariable uuid: String
     ): HttpEntity<TaskResult> {
-        if (collectionRepository.findByUUID(uuid)!!.publishStatus() == PublishStatus.Draft && !oAuthHelper.hasRole(appConfig.roleAdmin)) {
+        if (collectionRepository.findByUUID(uuid)!!.status == PublishStatus.Draft && !oAuthHelper.hasRole(appConfig.roleAdmin)) {
             throw ResponseStatusException(HttpStatus.UNAUTHORIZED)
         }
         val task = CsvTask(collectionUuid = uuid)
@@ -186,7 +189,6 @@ class CollectionController @Autowired constructor(
     fun removeCollection(
         @PathVariable uuid: String
     ): HttpEntity<TaskResult> {
-
         val task = RemoveCollectionSkillsTask(collectionUuid = uuid)
         taskMessageService.enqueueJob(TaskMessageService.removeCollectionSkills, task)
         return Task.processingResponse(task)
@@ -203,4 +205,28 @@ class CollectionController @Autowired constructor(
         val sizedIterable = auditLogRepository.findByTableAndId(CollectionTable.tableName, entityId = collection!!.id.value, offsetPageable = pageable)
         return ResponseEntity.status(200).body(sizedIterable.toList().map{it.toModel()})
     }
+
+    @GetMapping(RoutePaths.WORKSPACE_PATH, produces = [MediaType.APPLICATION_JSON_VALUE])
+    @ResponseBody
+    fun getOrCreateWorkspace(
+        @AuthenticationPrincipal user: Jwt?
+    ): ApiCollection? {
+        return collectionRepository.findByOwner(
+            oAuthHelper.readableUserIdentifier(user))?.let {
+            ApiCollection.fromDao(it, appConfig
+            )
+        } ?: collectionRepository.createFromApi(
+            listOf(
+                ApiCollectionUpdate(
+                    DEFAULT_WORKSPACE_NAME,
+                    PublishStatus.Workspace,
+                    oAuthHelper.readableUserName(user),
+                    ApiStringListUpdate()
+                )
+            ),
+            richSkillRepository,
+            oAuthHelper.readableUserName(user),
+            oAuthHelper.readableUserIdentifier(user)
+        ).firstOrNull()?.let { ApiCollection.fromDao(it, appConfig) }
+    }
 }

api/src/main/kotlin/edu/wgu/osmt/collection/CollectionDao.kt

@@ -17,6 +17,8 @@ class CollectionDao(id: EntityID<Long>) : LongEntity(id), OutputsModel<Collectio
     var uuid: String by CollectionTable.uuid
     var name: String by CollectionTable.name
     var author by KeywordDao optionalReferencedOn CollectionTable.author
+    var workspaceOwner by CollectionTable.workspaceOwner
+    var status by CollectionTable.status
 
     var skills by RichSkillDescriptorDao via CollectionSkills
 
@@ -31,6 +33,8 @@ class CollectionDao(id: EntityID<Long>) : LongEntity(id), OutputsModel<Collectio
             uuid = uuid,
             name = name,
             author = author?.toModel(),
+            workspaceOwner = workspaceOwner,
+            status = status,
             archiveDate = archiveDate,
             publishDate = publishDate
         )
@@ -41,7 +45,8 @@ class CollectionDao(id: EntityID<Long>) : LongEntity(id), OutputsModel<Collectio
             id = id.value,
             uuid = uuid,
             name = name,
-            publishStatus = publishStatus(),
+            workspaceOwner = workspaceOwner,
+            publishStatus = status,
             skillIds = if (embedded) null else skills.map { it.uuid },
             skillCount = if (embedded) null else skills.count().toInt(),
             author = author?.value,

api/src/main/kotlin/edu/wgu/osmt/collection/CollectionDoc.kt

@@ -68,5 +68,10 @@ data class CollectionDoc(
 
     @Field(type = FieldType.Date, format = [DateFormat.date_hour_minute_second])
     @get:JsonProperty("publishDate")
-    val publishDate: LocalDateTime? = null
+    val publishDate: LocalDateTime? = null,
+
+    @Field(type = Text)
+    @Nullable
+    val workspaceOwner: String?
+
 )

api/src/main/kotlin/edu/wgu/osmt/collection/CollectionRepository.kt

@@ -10,6 +10,7 @@ import edu.wgu.osmt.auditlog.AuditOperationType
 import edu.wgu.osmt.config.AppConfig
 import edu.wgu.osmt.db.ListFieldUpdate
 import edu.wgu.osmt.db.NullableFieldUpdate
+import edu.wgu.osmt.db.PublishStatus
 import edu.wgu.osmt.keyword.KeywordRepository
 import edu.wgu.osmt.keyword.KeywordTypeEnum
 import edu.wgu.osmt.richskill.RichSkillDescriptor
@@ -43,15 +44,17 @@ interface CollectionRepository {
     fun findById(id: Long): CollectionDao?
     fun findByUUID(uuid: String): CollectionDao?
     fun findByName(name: String): CollectionDao?
-    fun create(name: String, user: String): CollectionDao?
-    fun create(updateObject: CollectionUpdateObject, user: String): CollectionDao?
+    fun create(name: String, user: String, email: String): CollectionDao?
+    fun create(updateObject: CollectionUpdateObject, user: String, email: String): CollectionDao?
     fun update(updateObject: CollectionUpdateObject, user: String): CollectionDao?
     fun remove(uuid: String): ApiBatchResult
+    fun findByOwner(owner: String) : CollectionDao?
 
     fun createFromApi(
         apiUpdates: List<ApiCollectionUpdate>,
         richSkillRepository: RichSkillRepository,
-        user: String
+        user: String,
+        email: String,
     ): List<CollectionDao>
 
     fun collectionUpdateObjectFromApi(
@@ -107,11 +110,11 @@ class CollectionRepositoryImpl @Autowired constructor(
         return query?.let { dao.wrapRow(it) }
     }
 
-    override fun create(name: String, user: String): CollectionDao? {
-        return create(CollectionUpdateObject(name = name), user)
+    override fun create(name: String, user: String, email: String): CollectionDao? {
+        return create(CollectionUpdateObject(name = name), user, email)
     }
 
-    override fun create(updateObject: CollectionUpdateObject, user: String): CollectionDao? {
+    override fun create(updateObject: CollectionUpdateObject, user: String, email: String): CollectionDao? {
         if (updateObject.name.isNullOrBlank()) {
             return null
         }
@@ -125,6 +128,9 @@ class CollectionRepositoryImpl @Autowired constructor(
         }
 
         updateObject.copy(id = newCollection.id.value).applyToDao(newCollection)
+        if(PublishStatus.Workspace == newCollection.status) {
+            newCollection.workspaceOwner = email
+        }
 
         newCollection.let {
             collectionEsRepo.save(it.toDoc())
@@ -235,10 +241,16 @@ class CollectionRepositoryImpl @Autowired constructor(
 
     }
 
+    override fun findByOwner(owner: String): CollectionDao? {
+        val query = table.select { table.workspaceOwner eq owner }.firstOrNull()
+        return query?.let { dao.wrapRow(it) }
+    }
+
     override fun createFromApi(
         apiUpdates: List<ApiCollectionUpdate>,
         richSkillRepository: RichSkillRepository,
-        user: String
+        user: String,
+        email: String
     ): List<CollectionDao> {
         // pre validate all rows
         val allErrors = apiUpdates.mapIndexed { i, updateDto ->
@@ -251,7 +263,7 @@ class CollectionRepositoryImpl @Autowired constructor(
         // create records
         val newSkills = apiUpdates.map { update ->
             val updateObject = collectionUpdateObjectFromApi(update, richSkillRepository)
-            create(updateObject, user)
+            create(updateObject, user, email)
         }
         return newSkills.filterNotNull()
     }
@@ -270,7 +282,8 @@ class CollectionRepositoryImpl @Autowired constructor(
         val collectionUpdateObject = collectionUpdateObjectFromApi(collectionUpdate, richSkillRepository)
 
         val updateObjectWithId = collectionUpdateObject.copy(
-            id = existingCollectionId
+            id = existingCollectionId,
+            publishStatus = collectionUpdate.publishStatus
         )
 
         return update(updateObjectWithId, user)

api/src/main/kotlin/edu/wgu/osmt/collection/CollectionTable.kt

@@ -1,12 +1,18 @@
 package edu.wgu.osmt.collection
 
+import edu.wgu.osmt.db.PublishStatus
 import edu.wgu.osmt.db.PublishStatusUpdate
 import edu.wgu.osmt.db.TableWithUpdate
 import edu.wgu.osmt.keyword.KeywordTable
 import edu.wgu.osmt.richskill.RichSkillDescriptorTable
 import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.dao.id.LongIdTable
-import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.sql.Column
+import org.jetbrains.exposed.sql.ReferenceOption
+import org.jetbrains.exposed.sql.Table
+import org.jetbrains.exposed.sql.and
+import org.jetbrains.exposed.sql.deleteWhere
+import org.jetbrains.exposed.sql.insertIgnore
 import org.jetbrains.exposed.sql.`java-time`.datetime
 import java.time.LocalDateTime
 
@@ -23,8 +29,10 @@ object CollectionTable: TableWithUpdate<CollectionUpdateObject>, PublishStatusUp
         onDelete = ReferenceOption.RESTRICT,
         onUpdate = ReferenceOption.CASCADE
     ).nullable()
-
-
+    val workspaceOwner = varchar("workspace_owner", 64).index().default("")
+    val status = customEnumeration(
+        "status",
+        fromDb = { value -> PublishStatus.forApiValue(value as String)!! }, toDb = { it.name }).default(PublishStatus.Draft)
 }
 
 object CollectionSkills : Table("CollectionSkills") {

api/src/main/kotlin/edu/wgu/osmt/config/AppConfig.kt

@@ -31,6 +31,12 @@ class AppConfig(
     @Value("\${app.loginSuccessRedirectUrl}")
     val loginSuccessRedirectUrl: String,
 
+    @Value("\${app.userName:name}")
+    val userName: String,
+
+    @Value("\${app.userIdentifier:email}")
+    val userIdentifier: String,
+
     @Value("\${app.allowPublicSearching}")
     val allowPublicSearching: Boolean = true,
 

api/src/main/kotlin/edu/wgu/osmt/config/Constants.kt

@@ -2,6 +2,7 @@ package edu.wgu.osmt.config
 
 const val UNAUTHENTICATED_USERNAME = "unauthenticated"
 const val QUOTED_SEARCH_REGEX_PATTERN = "([\"\'])(?:(?=(\\\\?))\\2.)*?\\1"
+const val DEFAULT_WORKSPACE_NAME = "My Workspace"
 
 // API parameter constants
 const val CATEGORY_ASC = "name.asc"

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

@@ -118,7 +118,7 @@ class BatchImportRichSkill: CsvImport<RichSkillRow> {
     fun parseCollections(rowValue: String?): List<CollectionDao>? {
         return splitField(rowValue)?.filter { it.isNotBlank() }?.mapNotNull { collectionName ->
             val collection = collectionRepository.findByName(collectionName)
-            collection ?:  collectionRepository.create(CollectionUpdateObject(name = collectionName, author = NullableFieldUpdate(keywordRepository.getDefaultAuthor())), user)
+            collection ?: collection?.let { collectionRepository.create(CollectionUpdateObject(name = collectionName, author = NullableFieldUpdate(keywordRepository.getDefaultAuthor())), user, email = it.workspaceOwner) }
         }
     }