Added configuration for save db in cosv module (#2906)

* Added configuration for save db in cosv module

Author: Cheshiriks

save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/vulnerability/event/VulnerabilityMetadataListener.kt

@@ -4,9 +4,10 @@ import com.saveourtool.save.backend.service.NotificationService
 import com.saveourtool.save.backend.service.UserDetailsService
 import com.saveourtool.save.domain.Role
 import com.saveourtool.save.entities.Notification
-import com.saveourtool.save.entities.cosv.VulnerabilityMetadata
-import com.saveourtool.save.entities.cosv.evententities.VulnerabilityMetadataEvent
 import com.saveourtool.save.entities.vulnerability.VulnerabilityStatus
+import com.saveourtool.save.entitiescosv.VulnerabilityMetadata
+import com.saveourtool.save.entitiescosv.evententities.VulnerabilityMetadataEvent
+
 import org.springframework.context.event.EventListener
 import org.springframework.stereotype.Component
 

save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/ProjectProblemRepository.kt

@@ -1,7 +1,7 @@
 package com.saveourtool.save.backend.repository
 
 import com.saveourtool.save.entities.ProjectProblem
-import com.saveourtool.save.entities.cosv.VulnerabilityMetadata
+import com.saveourtool.save.entitiescosv.VulnerabilityMetadata
 import com.saveourtool.save.spring.repository.BaseEntityRepository
 import org.springframework.data.jpa.repository.Query
 import org.springframework.data.repository.query.Param

save-backend/src/main/kotlin/com/saveourtool/save/backend/service/ProjectProblemService.kt

@@ -55,7 +55,7 @@ class ProjectProblemService(
             name = problem.name,
             description = problem.description,
             critical = problem.critical,
-            vulnerabilityMetadata = vulnerabilityMetadata,
+            vulnerabilityMetadataId = vulnerabilityMetadata?.requiredId(),
             project = project,
             userId = user.requiredId(),
             isClosed = false,
@@ -75,7 +75,7 @@ class ProjectProblemService(
             description = projectProblemDto.description
             critical = projectProblemDto.critical
             isClosed = projectProblemDto.isClosed
-            this.vulnerabilityMetadata = vulnerabilityMetadata
+            this.vulnerabilityMetadataId = vulnerabilityMetadata?.requiredId()
         }
         projectProblemRepository.save(problem)
     }

save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/cosv/VulnerabilityExt.kt

@@ -13,7 +13,7 @@ import kotlinx.serialization.Serializable
  **/
 @Serializable
 data class VulnerabilityExt(
-    val metadataDto: VulnerabilityMetadataDto,
+    val metadataDto: VulnerabilityMetadataDtoWithUserAndOrganization,
     val cosv: RawCosvSchema,
     val saveContributors: List<UserInfo>,
 ) {

save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/cosv/VulnerabilityMetadataDto.kt

@@ -1,3 +1,5 @@
+@file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
+
 package com.saveourtool.save.entities.cosv
 
 import com.saveourtool.save.entities.OrganizationDto
@@ -14,8 +16,6 @@ import kotlinx.serialization.Serializable
  * @property severityNum [com.saveourtool.osv4k.Severity.scoreNum]
  * @property modified [com.saveourtool.osv4k.OsvSchema.modified]
  * @property submitted
- * @property user
- * @property organization
  * @property language
  * @property status
  * @property tags
@@ -28,8 +28,6 @@ data class VulnerabilityMetadataDto(
     val severityNum: Float,
     val modified: LocalDateTime,
     val submitted: LocalDateTime,
-    val user: UserInfo,
-    val organization: OrganizationDto?,
     val language: VulnerabilityLanguage,
     val status: VulnerabilityStatus,
     val tags: Set<String> = emptySet(),
@@ -43,3 +41,15 @@ data class VulnerabilityMetadataDto(
         const val SUMMARY_LENGTH = 250
     }
 }
+
+/**
+ * @property vulnerabilityMetadataDto
+ * @property user
+ * @property organization
+ **/
+@Serializable
+data class VulnerabilityMetadataDtoWithUserAndOrganization(
+    val vulnerabilityMetadataDto: VulnerabilityMetadataDto,
+    val user: UserInfo,
+    val organization: OrganizationDto?,
+)

save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Comment.kt

@@ -15,7 +15,7 @@ import kotlinx.datetime.toKotlinLocalDateTime
  * @property user
  */
 @Entity
-@Table(name = "comments")
+@Table(schema = "save_cloud", name = "comments")
 class Comment(
 
     var message: String,

save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Organization.kt

@@ -27,10 +27,13 @@ data class Organization(
     @Enumerated(EnumType.STRING)
     var status: OrganizationStatus,
     @Contextual
+    @Column(name = "date_created")
     var dateCreated: LocalDateTime,
     var avatar: String? = null,
     var description: String? = null,
+    @Column(name = "can_create_contests")
     var canCreateContests: Boolean = false,
+    @Column(name = "can_bulk_upload")
     var canBulkUpload: Boolean = false,
     var rating: Long = 0,
 ) : BaseEntityWithDto<OrganizationDto>() {

save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/OriginalLogin.kt

@@ -7,13 +7,15 @@ import com.fasterxml.jackson.annotation.JsonBackReference
 import javax.persistence.Entity
 import javax.persistence.JoinColumn
 import javax.persistence.ManyToOne
+import javax.persistence.Table
 
 /**
  * @property name
  * @property user
  * @property source
  */
 @Entity
+@Table(schema = "save_cloud", name = "original_login")
 class OriginalLogin(
     var name: String,
     @ManyToOne

save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/ProjectProblem.kt

@@ -1,14 +1,13 @@
 package com.saveourtool.save.entities
 
-import com.saveourtool.save.entities.cosv.VulnerabilityMetadata
 import com.saveourtool.save.spring.entity.BaseEntityWithDateAndDto
 import javax.persistence.*
 
 /**
  * @property name
  * @property description
  * @property critical
- * @property vulnerabilityMetadata
+ * @property vulnerabilityMetadataId
  * @property project
  * @property userId
  * @property isClosed
@@ -24,9 +23,7 @@ class ProjectProblem(
     @Enumerated(EnumType.STRING)
     var critical: ProjectProblemCritical,
 
-    @ManyToOne
-    @JoinColumn(name = "vulnerability_metadata_id")
-    var vulnerabilityMetadata: VulnerabilityMetadata?,
+    var vulnerabilityMetadataId: Long?,
 
     @ManyToOne
     @JoinColumn(name = "project_id")
@@ -41,7 +38,7 @@ class ProjectProblem(
         name = name,
         description = description,
         critical = critical,
-        identifier = vulnerabilityMetadata?.identifier,
+        identifier = "",
         organizationName = project.organization.name,
         projectName = project.name,
         isClosed = isClosed,

save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/User.kt

@@ -41,6 +41,7 @@ class User(
     var company: String? = null,
     var location: String? = null,
     var linkedin: String? = null,
+    @Column(name = "git_hub")
     var gitHub: String? = null,
     var twitter: String? = null,
     @Enumerated(EnumType.STRING)
@@ -54,7 +55,9 @@ class User(
     var originalLogins: List<OriginalLogin> = emptyList(),
     var rating: Long = 0,
     var website: String? = null,
+    @Column(name = "free_text")
     var freeText: String? = null,
+    @Column(name = "real_name")
     var realName: String? = null,
 ) : BaseEntityWithDate() {
     /**