Push works

cccp-education · Sep 28, 2024 · 7441f0b · 7441f0b
1 parent d38486b
commit 7441f0b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/springboot/api/src/main/kotlin/webapp/users/User.kt b/springboot/api/src/main/kotlin/webapp/users/User.kt
@@ -50,7 +50,7 @@ abstract class EntityModel<T>(
 inline fun <reified T : EntityModel<ID>, ID> T.withId(id: ID): T {
     // Use reflection to create a copy with the passed ID
     return this::class.constructors
-        .first { it.parameters.any { param -> param.name == "id" || param.name == "role"} }
+        .first { it.parameters.any { param -> param.name == "id"} }
         .call(id, *this::class.constructors.first().parameters.drop(1).map { param ->
             this::class.members.first { member -> member.name == param.name }.call(this)
         }.toTypedArray())

diff --git a/springboot/api/src/main/kotlin/webapp/users/security/Role.kt b/springboot/api/src/main/kotlin/webapp/users/security/Role.kt
@@ -7,13 +7,14 @@ import jakarta.validation.constraints.Size
 import webapp.core.property.ROLE_ADMIN
 import webapp.core.property.ROLE_ANONYMOUS
 import webapp.core.property.ROLE_USER
+import webapp.users.EntityModel
 import webapp.users.security.Role.RoleDao.Fields.ID_FIELD
 
 data class Role(
     @field:NotNull
     @field:Size(max = 50)
-    val role: String
-) {
+    override val id: String
+):EntityModel<String>() {
     object RoleDao {
         object Fields {
             const val ID_FIELD = "`role`"

diff --git a/springboot/api/src/test/kotlin/webapp/users/signup/SignupIntegrationTests.kt b/springboot/api/src/test/kotlin/webapp/users/signup/SignupIntegrationTests.kt
@@ -98,7 +98,7 @@ class SignupIntegrationTests {
 //        assertEquals(0, countUserAuthBefore)
         client
             .post()
-            .uri(API_SIGNUP_PATH)
+            .uri("/api/users/foobar")
             .contentType(APPLICATION_JSON)
             .bodyValue(user)
             .exchange()
@@ -114,7 +114,7 @@ class SignupIntegrationTests {
 //        assertEquals(countUserAuthBefore + 1, context.countUserAuthority())
         (user to context).findOneByEmail(user.email).run {
             when (this) {
-                    is Left -> assertEquals(EmptyResultDataAccessException::class.java,value::class.java )
+                is Left -> assertEquals(EmptyResultDataAccessException::class.java, value::class.java)
                 is Right -> {
                     assertEquals(user, value)
                 }