Update

src/main/kotlin/com/serge/nsn/qanda_hub/QandAHubApplication.kt → src/main/kotlin/com/serge/nsn/qahub/QAHubApplication.kt

@@ -1,12 +1,15 @@
-package com.serge.nsn.qanda_hub
+package com.serge.nsn.qahub
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 
 @SpringBootApplication
 
-class QandAHubApplication
+class QAHubApplication
 
 fun main(args: Array<String>) {
-    runApplication<QandAHubApplication>(*args)
+    runApplication<QAHubApplication>(*args)
 }
+
+//typealias  Id = UUID
+//val id = Id()

src/main/kotlin/com/serge/nsn/qanda_hub/api/controller/AnswerController.kt → src/main/kotlin/com/serge/nsn/qahub/api/controller/AnswerController.kt

@@ -1,14 +1,9 @@
-package com.serge.nsn.qanda_hub.api.controller
+package com.serge.nsn.qahub.api.controller
 
-import com.serge.nsn.qanda_hub.api.dto.AnswerDto
-import com.serge.nsn.qanda_hub.services.AnswerService
+import com.serge.nsn.qahub.api.dto.AnswerDto
+import com.serge.nsn.qahub.services.AnswerService
 import lombok.RequiredArgsConstructor
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PathVariable
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
 
 @RestController
 @RequiredArgsConstructor

src/main/kotlin/com/serge/nsn/qanda_hub/api/controller/AuthenticationController.kt → src/main/kotlin/com/serge/nsn/qahub/api/controller/AuthenticationController.kt

@@ -1,9 +1,10 @@
-package com.serge.nsn.qanda_hub.api.controller
+package com.serge.nsn.qahub.api.controller
 
-import com.serge.nsn.qanda_hub.api.dto.UserDto
-import com.serge.nsn.qanda_hub.configuration.jwt.JWTService
-import com.serge.nsn.qanda_hub.configuration.jwt.LoginRequest
-import com.serge.nsn.qanda_hub.services.UserService
+import com.serge.nsn.qahub.api.dto.UserDto
+import com.serge.nsn.qahub.api.model.LoginRequest
+import com.serge.nsn.qahub.api.model.LoginResponse
+import com.serge.nsn.qahub.configuration.jwt.JWTService
+import com.serge.nsn.qahub.services.UserService
 import lombok.RequiredArgsConstructor
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
@@ -29,13 +30,22 @@ class AuthenticationController(
         ResponseEntity(userService.register_user(dto), HttpStatus.CREATED)
 
     @PostMapping("/login")
-    fun login(@RequestBody request: LoginRequest): String {
+    fun login(@RequestBody request: LoginRequest): LoginResponse {
         val authentication = authenticationManager
-            .authenticate(UsernamePasswordAuthenticationToken(request.userName, request.password))
+            .authenticate(UsernamePasswordAuthenticationToken(request.username, request.password))
         return if (authentication.isAuthenticated) {
-            jwtService.generateToken(request.userName)
+            LoginResponse(accessToken = jwtService.generateToken(request.username))
         } else {
             throw UsernameNotFoundException("Invalid user credentials")
         }
     }
+
+    @RequestMapping("/batch-registration")
+
+
+    @PostMapping
+    fun createUsers(@RequestBody newUsers: List<UserDto>): ResponseEntity<List<UserDto>> {
+        return ResponseEntity(userService.batchRegister(newUsers), HttpStatus.CREATED)
+
+    }
 }

src/main/kotlin/com/serge/nsn/qahub/api/controller/CommentController.kt

@@ -0,0 +1,22 @@
+package com.serge.nsn.qahub.api.controller
+
+import com.serge.nsn.qahub.api.dto.CommentDto
+import com.serge.nsn.qahub.services.CommentService
+import org.springframework.web.bind.annotation.*
+
+@RestController
+@RequestMapping("/api/comment")
+class CommentController(
+    private val commentService: CommentService
+) {
+
+    @GetMapping("/all")
+    fun allComments() = commentService.getAllComments()
+
+    @GetMapping("/{id}")
+    fun getComment(@PathVariable id: Long) = commentService.getComment(id)
+
+    @PostMapping("/reply")
+    fun reply(@RequestBody comment: CommentDto) = commentService.comment(comment)
+
+}

src/main/kotlin/com/serge/nsn/qanda_hub/api/controller/UserController.kt → src/main/kotlin/com/serge/nsn/qahub/api/controller/UserController.kt

@@ -1,9 +1,9 @@
-package com.serge.nsn.qanda_hub.api.controller
+package com.serge.nsn.qahub.api.controller
 
-import com.serge.nsn.qanda_hub.api.dto.UserDto
-import com.serge.nsn.qanda_hub.data.entities.UserEntity
-import com.serge.nsn.qanda_hub.services.UserService
+import com.serge.nsn.qahub.api.dto.UserDto
+import com.serge.nsn.qahub.services.UserService
 import org.springframework.web.bind.annotation.*
+import java.security.Principal
 
 @RestController
 @CrossOrigin
@@ -18,4 +18,10 @@ class UserController(
     @GetMapping("/{userId}")
     fun getUser(@PathVariable userId: Long) = userService.getById(userId)
 
+    @GetMapping("/user")
+    fun getCurrentUser(principal: Principal): String {
+        val username = principal.name
+        return "Current user: $username"
+    }
+
 }

src/main/kotlin/com/serge/nsn/qahub/api/dto/AnswerDto.kt

@@ -0,0 +1,13 @@
+package com.serge.nsn.qahub.api.dto
+
+import com.serge.nsn.qahub.data.entities.AnswerEntity
+
+class AnswerDto(
+    val id: Long? = null,
+    val content: String = "",
+) {
+    constructor(answerEntity: AnswerEntity) : this(
+        id = answerEntity.id,
+        content = answerEntity.content
+    )
+}

src/main/kotlin/com/serge/nsn/qanda_hub/api/dto/CommentDto.kt → src/main/kotlin/com/serge/nsn/qahub/api/dto/CommentDto.kt

@@ -1,4 +1,4 @@
-package com.serge.nsn.qanda_hub.api.dto
+package com.serge.nsn.qahub.api.dto
 
 class CommentDto(
     val comment_id: Long? = null,

src/main/kotlin/com/serge/nsn/qanda_hub/api/dto/QuestionDto.kt → src/main/kotlin/com/serge/nsn/qahub/api/dto/QuestionDto.kt

@@ -1,17 +1,19 @@
-package com.serge.nsn.qanda_hub.api.dto
+package com.serge.nsn.qahub.api.dto
 
-import com.serge.nsn.qanda_hub.data.entities.QuestionEntity
+import com.serge.nsn.qahub.data.entities.QuestionEntity
 
 class QuestionDto(
-    val question_id: Long? = null,
+    val id: Long? = null,
     val title: String = "",
     val content: String = "",
+    val author: String = "",
 //    val user: UserDto? = null
 ) {
     constructor(questionEntity: QuestionEntity) : this(
-        question_id = questionEntity.id,
+        id = questionEntity.id,
         title = questionEntity.title,
         content = questionEntity.content,
-//        user = UserDto(questionEntity.user)
+        author = questionEntity.author,
+//        user = questionEntity.user
     )
 }

src/main/kotlin/com/serge/nsn/qanda_hub/api/dto/UserDto.kt → src/main/kotlin/com/serge/nsn/qahub/api/dto/UserDto.kt

@@ -1,6 +1,6 @@
-package com.serge.nsn.qanda_hub.api.dto
+package com.serge.nsn.qahub.api.dto
 
-import com.serge.nsn.qanda_hub.data.entities.UserEntity
+import com.serge.nsn.qahub.data.entities.UserEntity
 
 class UserDto(
     val user_id: Long? = null,
@@ -9,14 +9,14 @@ class UserDto(
     val password: String = "",
     val email: String = "",
     val role: String = "",
-    val questions: List<QuestionDto> = listOf()
-) {
+
+    ) {
     constructor(userEntity: UserEntity) : this(
         user_id = userEntity.id,
         name = userEntity.name,
         username = userEntity.username,
         email = userEntity.email,
         role = userEntity.roles,
-        questions = userEntity.questions.map { QuestionDto(it) }
+//        questions = userEntity.questions.map { QuestionDto(it) }
     )
 }

src/main/kotlin/com/serge/nsn/qahub/api/model/LoginRequest.kt

@@ -0,0 +1,6 @@
+package com.serge.nsn.qahub.api.model
+
+class LoginRequest(
+    val username: String,
+    val password: String
+)

src/main/kotlin/com/serge/nsn/qahub/api/model/LoginResponse.kt

@@ -0,0 +1,3 @@
+package com.serge.nsn.qahub.api.model
+
+data class LoginResponse(val accessToken: String)

src/main/kotlin/com/serge/nsn/qanda_hub/configuration/QAUserDetails.kt → src/main/kotlin/com/serge/nsn/qahub/configuration/QAUserDetails.kt

@@ -1,6 +1,6 @@
-package com.serge.nsn.qanda_hub.configuration
+package com.serge.nsn.qahub.configuration
 
-import com.serge.nsn.qanda_hub.data.entities.UserEntity
+import com.serge.nsn.qahub.data.entities.UserEntity
 import lombok.Data
 import org.springframework.security.core.GrantedAuthority
 import org.springframework.security.core.authority.SimpleGrantedAuthority

src/main/kotlin/com/serge/nsn/qanda_hub/configuration/QAUserDetailsService.kt → src/main/kotlin/com/serge/nsn/qahub/configuration/QAUserDetailsService.kt

@@ -1,6 +1,6 @@
-package com.serge.nsn.qanda_hub.configuration
+package com.serge.nsn.qahub.configuration
 
-import com.serge.nsn.qanda_hub.data.repositories.UserRepository
+import com.serge.nsn.qahub.data.repositories.UserRepository
 import lombok.RequiredArgsConstructor
 import org.springframework.security.core.userdetails.UserDetails
 import org.springframework.security.core.userdetails.UserDetailsService

src/main/kotlin/com/serge/nsn/qanda_hub/configuration/SecurityConfig.kt → src/main/kotlin/com/serge/nsn/qahub/configuration/SecurityConfig.kt

@@ -1,7 +1,7 @@
-package com.serge.nsn.qanda_hub.configuration
+package com.serge.nsn.qahub.configuration
 
-import com.serge.nsn.qanda_hub.configuration.jwt.JWTAuthenticationFilter
-import com.serge.nsn.qanda_hub.configuration.jwt.JwtAuthenticationEntryPoint
+import com.serge.nsn.qahub.configuration.jwt.JWTAuthenticationFilter
+import com.serge.nsn.qahub.configuration.jwt.JwtAuthenticationEntryPoint
 import lombok.RequiredArgsConstructor
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -18,6 +18,9 @@ import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter
+import org.springframework.web.cors.CorsConfiguration
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource
+import org.springframework.web.filter.CorsFilter
 
 @Configuration
 @EnableWebSecurity
@@ -29,7 +32,7 @@ class SecurityConfig(
 ) {
 
     companion object {
-        val UN_SECURED_URL = arrayOf("/api/auth/**", "/")
+        val UN_SECURED_URL = arrayOf("/api/auth/**", "/api/auth/login")
     }
 
     @Bean
@@ -71,4 +74,18 @@ class SecurityConfig(
     fun authenticationManager(authConfig: AuthenticationConfiguration): AuthenticationManager {
         return authConfig.authenticationManager
     }
+
+    @Bean
+    fun corsConfig(): CorsFilter {
+        val config = CorsConfiguration()
+        config.addAllowedOrigin("http://192.168.119.99:4200")
+        config.addAllowedOrigin("http://localhost:4200")
+        config.addAllowedMethod("POST")
+        config.addAllowedMethod("GET")
+        config.addAllowedHeader("*")
+        val source = UrlBasedCorsConfigurationSource()
+        source.registerCorsConfiguration("/**", config)
+        return CorsFilter(source)
+    }
+
 }

src/main/kotlin/com/serge/nsn/qanda_hub/configuration/exceptions/UserNotFoundException.kt → src/main/kotlin/com/serge/nsn/qahub/configuration/exceptions/UserNotFoundException.kt

@@ -1,3 +1,3 @@
-package com.serge.nsn.qanda_hub.configuration.exceptions
+package com.serge.nsn.qahub.configuration.exceptions
 
 class UserNotFoundException(message: String?) : RuntimeException(message)

src/main/kotlin/com/serge/nsn/qanda_hub/configuration/jwt/JWTAuthenticationFilter.kt → src/main/kotlin/com/serge/nsn/qahub/configuration/jwt/JWTAuthenticationFilter.kt

@@ -1,6 +1,6 @@
-package com.serge.nsn.qanda_hub.configuration.jwt
+package com.serge.nsn.qahub.configuration.jwt
 
-import com.serge.nsn.qanda_hub.configuration.QAUserDetailsService
+import com.serge.nsn.qahub.configuration.QAUserDetailsService
 import jakarta.servlet.FilterChain
 import jakarta.servlet.ServletException
 import jakarta.servlet.http.HttpServletRequest

src/main/kotlin/com/serge/nsn/qanda_hub/configuration/jwt/JWTService.kt → src/main/kotlin/com/serge/nsn/qahub/configuration/jwt/JWTService.kt

@@ -1,4 +1,4 @@
-package com.serge.nsn.qanda_hub.configuration.jwt
+package com.serge.nsn.qahub.configuration.jwt
 
 import io.jsonwebtoken.Claims
 import io.jsonwebtoken.Jwts

src/main/kotlin/com/serge/nsn/qanda_hub/configuration/jwt/JwtAuthenticationEntryPoint.kt → src/main/kotlin/com/serge/nsn/qahub/configuration/jwt/JwtAuthenticationEntryPoint.kt

@@ -1,4 +1,4 @@
-package com.serge.nsn.qanda_hub.configuration.jwt
+package com.serge.nsn.qahub.configuration.jwt
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import jakarta.servlet.http.HttpServletRequest

src/main/kotlin/com/serge/nsn/qanda_hub/data/entities/AnswerEntity.kt → src/main/kotlin/com/serge/nsn/qahub/data/entities/AnswerEntity.kt

@@ -1,12 +1,12 @@
-package com.serge.nsn.qanda_hub.data.entities
+package com.serge.nsn.qahub.data.entities
 
 import jakarta.persistence.*
 
 @Entity
 data class AnswerEntity(
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    val answer_id: Long? = null,
+    val id: Long? = null,
     val content: String,
 
     @ManyToOne(fetch = FetchType.EAGER)

src/main/kotlin/com/serge/nsn/qanda_hub/data/entities/CommentEntity.kt → src/main/kotlin/com/serge/nsn/qahub/data/entities/CommentEntity.kt

@@ -1,12 +1,12 @@
-package com.serge.nsn.qanda_hub.data.entities
+package com.serge.nsn.qahub.data.entities
 
 import jakarta.persistence.*
 
 @Entity
 data class CommentEntity(
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    val comment_id: Long? = null,
+    val id: Long? = null,
     val content: String,
 
     @ManyToOne(fetch = FetchType.EAGER)

src/main/kotlin/com/serge/nsn/qanda_hub/data/entities/QuestionEntity.kt → src/main/kotlin/com/serge/nsn/qahub/data/entities/QuestionEntity.kt

@@ -1,4 +1,4 @@
-package com.serge.nsn.qanda_hub.data.entities
+package com.serge.nsn.qahub.data.entities
 
 import jakarta.persistence.*
 
@@ -9,6 +9,7 @@ data class QuestionEntity(
     val id: Long? = null,
     val title: String = "",
     val content: String = "",
+    val author: String = "",
 
     @ManyToOne
     @JoinColumn(name = "user_id")

src/main/kotlin/com/serge/nsn/qanda_hub/data/entities/UserEntity.kt → src/main/kotlin/com/serge/nsn/qahub/data/entities/UserEntity.kt

@@ -1,4 +1,4 @@
-package com.serge.nsn.qanda_hub.data.entities
+package com.serge.nsn.qahub.data.entities
 
 import jakarta.persistence.*
 

src/main/kotlin/com/serge/nsn/qanda_hub/data/repositories/AnswerRepository.kt → src/main/kotlin/com/serge/nsn/qahub/data/repositories/AnswerRepository.kt

@@ -1,6 +1,6 @@
-package com.serge.nsn.qanda_hub.data.repositories
+package com.serge.nsn.qahub.data.repositories
 
-import com.serge.nsn.qanda_hub.data.entities.AnswerEntity
+import com.serge.nsn.qahub.data.entities.AnswerEntity
 import org.springframework.data.jpa.repository.JpaRepository
 
 interface AnswerRepository : JpaRepository<AnswerEntity, Long>

src/main/kotlin/com/serge/nsn/qanda_hub/data/repositories/CommentRepository.kt → src/main/kotlin/com/serge/nsn/qahub/data/repositories/CommentRepository.kt

@@ -1,6 +1,6 @@
-package com.serge.nsn.qanda_hub.data.repositories
+package com.serge.nsn.qahub.data.repositories
 
-import com.serge.nsn.qanda_hub.data.entities.CommentEntity
+import com.serge.nsn.qahub.data.entities.CommentEntity
 import org.springframework.data.jpa.repository.JpaRepository
 
 interface CommentRepository : JpaRepository<CommentEntity, Long>

src/main/kotlin/com/serge/nsn/qanda_hub/data/repositories/QuestionRepository.kt → src/main/kotlin/com/serge/nsn/qahub/data/repositories/QuestionRepository.kt

@@ -1,6 +1,6 @@
-package com.serge.nsn.qanda_hub.data.repositories
+package com.serge.nsn.qahub.data.repositories
 
-import com.serge.nsn.qanda_hub.data.entities.QuestionEntity
+import com.serge.nsn.qahub.data.entities.QuestionEntity
 import org.springframework.data.jpa.repository.JpaRepository
 
 interface QuestionRepository : JpaRepository<QuestionEntity, Long> {