Skip to content

Commit 638ccb2

Browse files
authored
Fixed proposing new vulnerability (#2913)
1 parent ceda43f commit 638ccb2

6 files changed

Lines changed: 7 additions & 23 deletions

File tree

save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entitiescosv/CosvGeneratedId.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ package com.saveourtool.save.entitiescosv
22

33
import com.saveourtool.save.spring.entity.BaseEntityWithDate
44
import javax.persistence.Entity
5+
import javax.persistence.Table
56

67
/**
78
* Entity for generated id of vulnerability
89
*/
910
@Entity
11+
@Table(schema = "cosv", name = "cosv_generated_id")
1012
class CosvGeneratedId : BaseEntityWithDate() {
1113
/**
1214
* @return Vulnerability identifier for saved entity

save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entitiescosv/LnkVulnerabilityMetadataUser.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import javax.persistence.*
99
*/
1010
@Entity
1111
@Suppress("KDOC_NO_CONSTRUCTOR_PROPERTY_WITH_COMMENT")
12+
@Table(schema = "cosv", name = "lnk_vulnerability_metadata_user")
1213
class LnkVulnerabilityMetadataUser(
1314
// Fetching two or more Bags(List) at the same time on an Entity could form a Cartesian Product. Since a Bag doesn't have an order,
1415
// Hibernate would not be able to map the right columns to the right entities. Hence, in this case, it throws a MultipleBagFetchException.

save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/spring/entity/BaseEntity.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ package com.saveourtool.save.spring.entity
22

33
import com.saveourtool.save.listeners.DateListener
44
import com.saveourtool.save.validation.Validatable
5-
import javax.persistence.EntityListeners
6-
import javax.persistence.GeneratedValue
7-
import javax.persistence.Id
8-
import javax.persistence.MappedSuperclass
5+
import javax.persistence.*
96

107
/**
118
* base class for all entities
@@ -18,7 +15,7 @@ abstract class BaseEntity : Validatable {
1815
* generate a unique id
1916
*/
2017
@Id
21-
@GeneratedValue
18+
@GeneratedValue(strategy = GenerationType.IDENTITY)
2219
open var id: Long? = null
2320

2421
/**

save-cosv/src/main/kotlin/com/saveourtool/save/cosv/repositorysave/UserRepository.kt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,13 @@ import com.saveourtool.save.repository.ValidateRepository
66
import com.saveourtool.save.spring.repository.BaseEntityRepository
77
import org.springframework.data.domain.Page
88
import org.springframework.data.domain.Pageable
9-
import org.springframework.data.jpa.repository.Query
10-
import org.springframework.data.repository.query.Param
119
import org.springframework.stereotype.Repository
1210

1311
/**
1412
* Repository to access data about users
1513
*/
1614
@Repository
1715
interface UserRepository : BaseEntityRepository<User>, ValidateRepository {
18-
/**
19-
* @param userName user name for update
20-
* @param rating new user rating
21-
* @return updated user
22-
*/
23-
@Query(
24-
value = "update save_cloud.user u set u.rating = :rating where u.name = :user_name",
25-
nativeQuery = true,
26-
)
27-
fun updateUser(
28-
@Param("user_name") userName: String,
29-
@Param("rating") rating: Long,
30-
)
31-
3216
/**
3317
* @param ids
3418
* @return users with [ids]

save-cosv/src/main/kotlin/com/saveourtool/save/cosv/service/UserService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class UserService(
3838
* @param user user for update
3939
* @return updated user
4040
*/
41-
fun saveUser(user: User) = userRepository.updateUser(user.name, user.rating)
41+
fun saveUser(user: User) = userRepository.save(user)
4242

4343
/**
4444
* @param name

save-cosv/src/main/kotlin/com/saveourtool/save/cosv/service/VulnerabilityRatingService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class VulnerabilityRatingService(
5757
userService.saveUser(owner.apply { rating += ownerRatingIncrement })
5858
val organization = organizationId?.let { organizationService.getOrganizationById(it) }
5959
organization?.let {
60-
organizationService.saveOrganization(organization.apply { rating += organizationRatingIncrement })
60+
organizationService.updateOrganization(organization.apply { rating += organizationRatingIncrement })
6161
}
6262
}
6363

0 commit comments

Comments
 (0)