Salvar informacoes essenciais do usuario

build.gradle.kts

@@ -50,7 +50,7 @@ dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-
+    testImplementation("io.cucumber:cucumber-spring:7.22.2")
     testImplementation(platform("org.junit:junit-bom:5.12.2"))
     testImplementation(platform("io.cucumber:cucumber-bom:7.22.2"))
     testImplementation(platform("org.assertj:assertj-bom:3.27.3"))

src/main/kotlin/ufrpe/sbpc/botpcd/config/WhatsappApiConfig.kt

@@ -6,8 +6,10 @@ import com.whatsapp.api.impl.WhatsappBusinessCloudApi
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Profile
 import java.beans.BeanProperty
 
+@Profile("!test")
 @Configuration
 class WhatsappApiConfig {
     @Value("\${whatsapp.api.token}")

src/main/kotlin/ufrpe/sbpc/botpcd/controller/GlobalExceptionHandler.kt

@@ -0,0 +1,19 @@
+package ufrpe.sbpc.botpcd.controller
+
+import org.slf4j.LoggerFactory
+import org.springframework.http.HttpStatus
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.ControllerAdvice
+import org.springframework.web.bind.annotation.ExceptionHandler
+import org.slf4j.Logger
+
+@ControllerAdvice
+class GlobalExceptionHandler {
+    val logger: Logger = LoggerFactory.getLogger(WhatsappWebhookController::class.java)
+
+    @ExceptionHandler(RuntimeException::class)
+    fun runtimeExceptionHandler(runtimeException: RuntimeException): ResponseEntity<Map<String, String>> {
+        logger.error("Erro inesperado ao chamar a API", runtimeException)
+        return ResponseEntity(mapOf("message" to "Some error ocorrer calling the API"), HttpStatus.INTERNAL_SERVER_ERROR)
+    }
+}

src/main/kotlin/ufrpe/sbpc/botpcd/controller/WhatsappWebhookController.kt

@@ -2,19 +2,22 @@ package ufrpe.sbpc.botpcd.controller
 
 import com.whatsapp.api.domain.webhook.WebHook
 import com.whatsapp.api.domain.webhook.WebHookEvent
+import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
+import ufrpe.sbpc.botpcd.entity.MessageExchange
+import ufrpe.sbpc.botpcd.repository.MessageExchangeRepository
 import ufrpe.sbpc.botpcd.service.FirstContactService
 
 
 @RestController
-class WhatsappWebhookController(private val firstContactService: FirstContactService) {
+class WhatsappWebhookController(private val firstContactService: FirstContactService, private val messageExchangeRepository: MessageExchangeRepository) {
 	@Value("\${whatsapp.verify.token}")
 	lateinit var VERIFY_TOKEN: String
-	var logger = LoggerFactory.getLogger(WhatsappWebhookController::class.java)
+	val logger: Logger = LoggerFactory.getLogger(WhatsappWebhookController::class.java)
 
 	@PostMapping("/webhooks")
 	fun eventNotification(
@@ -27,11 +30,15 @@ class WhatsappWebhookController(private val firstContactService: FirstContactSer
 		val event: WebHookEvent = WebHook.constructEvent(body)
 		for(entry in event.entry) {
 			for(change in entry.changes) {
-				firstContactService.redirectFluxByUserType(change.value.contacts[0].waId, change)
+				if(change.value?.messages == null) {
+					return ResponseEntity.ok("We don't handle this type of message")
+				}
+				val userPhoneNumber = change.value.contacts[0].waId
+				firstContactService.redirectFluxByUserType(userPhoneNumber, change)
 			}
 		}
 		// Opcional: validar assinatura com 'signature'
-		return ResponseEntity.ok("Evento processado")
+		return ResponseEntity.ok("Event process")
 	}
 
 	@GetMapping("/webhooks")

src/main/kotlin/ufrpe/sbpc/botpcd/entity/Attendance.kt

@@ -27,9 +27,13 @@ class Attendance(
     var pwd: PWD,
 
     @ManyToOne
-    @JoinColumn(name = "monitor_id")
-    @NotNull(message = "The monitor is required")
-    var monitor: Monitor,
+    @JoinColumn(name = "attendant_id")
+    @NotNull(message = "The attendant ID is required")
+    var attendant: Attendant,
+
+    @Enumerated(EnumType.STRING)
+    @NotNull(message = "The attendant type is required")
+    var attendantType: Provider,
 
     // Campos opcionais que serão atualizados durante o ciclo de vida do atendimento
     var acceptDateTime: LocalDateTime? = null,
@@ -41,4 +45,3 @@ class Attendance(
 
     var endDateTime: LocalDateTime? = null
 )
-

src/main/kotlin/ufrpe/sbpc/botpcd/entity/Attendant.kt

@@ -0,0 +1,16 @@
+package ufrpe.sbpc.botpcd.entity
+
+import jakarta.persistence.Entity
+import jakarta.persistence.EnumType
+import jakarta.persistence.Enumerated
+import jakarta.persistence.Table
+import jakarta.validation.constraints.NotEmpty
+
+@Entity
+@Table(name = "tb_attendant")
+abstract class Attendant(
+    name: String,
+    phoneNumber: String,
+    @Enumerated(EnumType.STRING)
+    var status: UserStatus = UserStatus.AVAILABLE
+) : User(name = name, phoneNumber = phoneNumber)

src/main/kotlin/ufrpe/sbpc/botpcd/entity/CommitteeMember.kt

@@ -10,5 +10,6 @@ import jakarta.persistence.Table
 @Table(name = "committee_member")
 class CommitteeMember(
     name: String,
-    phoneNumber: String
-): User(name = name, phoneNumber = phoneNumber)
+    phoneNumber: String,
+    status: UserStatus
+): Attendant(name = name, phoneNumber = phoneNumber, status = status)

src/main/kotlin/ufrpe/sbpc/botpcd/entity/Disability.kt

@@ -12,16 +12,23 @@ enum class Disability(val textOption: String) {
 	PHYSICAL_DISABILITY("Deficiência física"),
 	MOBILITY_IMPAIRED("Não tenho deficiência, mas tenho mobilidade reduzida");
 
+
 	companion object {
-		fun parse(text: String): Disability {
+		fun getByText(text: String): Disability {
 			val disability = Disability.entries.find { it.textOption.equals(text, ignoreCase = true) }
 			if(disability == null) {
 				throw IllegalArgumentException("Invalid disability type: $text")
 			}
 			return disability
 		}
-		fun textList(): Array<String> {
-			return Disability.entries.map { it.textOption }.toTypedArray()
+		fun getOptions(): String {
+			var message = "Olá, qual sua deficiência?\n"
+			for (disability in Disability.entries) {
+				message += "- Digite ${disability.ordinal + 1} para ${disability.textOption}\n"
+			}
+			message += "- Digite 7 para Não preciso de suporte."
+			return message
 		}
+		fun getByOrdinal(ordinal: Int) = Disability.entries.find { it.ordinal == ordinal }
 	}
 }

src/main/kotlin/ufrpe/sbpc/botpcd/entity/MessageExchange.kt

@@ -0,0 +1,23 @@
+package ufrpe.sbpc.botpcd.entity
+
+import jakarta.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+import org.hibernate.annotations.CreationTimestamp
+import java.time.LocalDateTime
+
+@Entity
+class MessageExchange(
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    var id: Long? = null,
+    var fromPhoneNumber: String,
+    var toPhoneNumber: String,
+    @Column(columnDefinition = "TEXT")
+    var message: String
+) {
+    @CreationTimestamp
+    var createAt: LocalDateTime? = null
+}

src/main/kotlin/ufrpe/sbpc/botpcd/entity/Monitor.kt

@@ -14,7 +14,8 @@ import jakarta.validation.constraints.NotEmpty
 class Monitor(
     name: String,
     phoneNumber: String,
+    status: UserStatus,
     @Enumerated(value = EnumType.STRING)
     @NotEmpty(message = "Monitor needs to have an assistance type")
-    var assistanceTypes: MonitorAssistanceType,
-) : User(name = name, phoneNumber = phoneNumber)
+    var assistanceTypes: MonitorAssistanceType
+) : Attendant(name = name, phoneNumber = phoneNumber, status = status)

src/main/kotlin/ufrpe/sbpc/botpcd/entity/PWD.kt

@@ -1,8 +1,14 @@
 package ufrpe.sbpc.botpcd.entity
 
+import jakarta.persistence.CascadeType
+import jakarta.persistence.ElementCollection
 import jakarta.persistence.Entity
 import jakarta.persistence.EnumType
 import jakarta.persistence.Enumerated
+import jakarta.persistence.CollectionTable
+import jakarta.persistence.Column
+import jakarta.persistence.JoinColumn
+import jakarta.persistence.OneToMany
 import jakarta.persistence.Table
 import jakarta.validation.constraints.NotEmpty;
 import org.springframework.data.repository.NoRepositoryBean
@@ -17,8 +23,9 @@ import org.springframework.data.repository.NoRepositoryBean
 class PWD(
     name: String? = null,
     phoneNumber: String,
-    phoneNumberId: String,
-    @NotEmpty(message = "The PWD needs to have a disability")
-    @Enumerated(value = EnumType.STRING)
-    var disability: MutableSet<Disability>
-): User(name = name, phoneNumber = phoneNumber, phoneNumberId = phoneNumberId)
+    @ElementCollection(targetClass = Disability::class)
+    @CollectionTable(name = "tb_pwd_disabilities", joinColumns = [JoinColumn(name = "pwd_id")])
+    @Column(name = "disability")
+    @Enumerated(EnumType.STRING)
+    var disabilities: MutableSet<Disability> = mutableSetOf()
+): User(name = name, phoneNumber = phoneNumber)

src/main/kotlin/ufrpe/sbpc/botpcd/entity/PWDDisability.kt

@@ -0,0 +1,26 @@
+package ufrpe.sbpc.botpcd.entity
+
+import jakarta.persistence.Entity
+import jakarta.persistence.EnumType
+import jakarta.persistence.Enumerated
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+import jakarta.persistence.JoinColumn
+import jakarta.persistence.ManyToOne
+import jakarta.persistence.Table
+
+@Entity
+@Table(name="tb_pwd_disability")
+class PWDDisability(
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    val id: Long?= null,
+
+    @Enumerated(EnumType.STRING)
+    val disability: Disability,
+
+    @ManyToOne
+    @JoinColumn(name="pwd_id")
+    val pwd: PWD
+)

src/main/kotlin/ufrpe/sbpc/botpcd/entity/ServiceType.kt

@@ -3,23 +3,69 @@ package ufrpe.sbpc.botpcd.entity
 /**
  *
  */
-sealed class ServiceType(val provider: Provider, val disability: Set<Disability>) {
-    object Libras : ServiceType(provider = Provider.MONITOR, disability = mutableSetOf(Disability.DEAFNESS)) {
+sealed class ServiceType(
+    val provider: Provider,
+    val disability: Set<Disability>,
+    val description: String
+) {
+    object Libras : ServiceType(
+        provider = Provider.MONITOR,
+        disability = mutableSetOf(Disability.DEAFNESS),
+        description = "informações em Libras"
+    ) {
         val monitorAssistanceType = MonitorAssistanceType.LIBRAS_MONITOR
     }
-    object LibrasInterpreter: ServiceType(provider = Provider.COMMITTEE_MEMBER, disability = mutableSetOf(Disability.DEAFNESS))
-    object Mobility: ServiceType(provider = Provider.MONITOR, disability = mutableSetOf(Disability.MOBILITY_IMPAIRED, Disability.PHYSICAL_DISABILITY, Disability.BLINDED)) {
+    object LibrasInterpreter : ServiceType(
+        provider = Provider.COMMITTEE_MEMBER,
+        disability = mutableSetOf(Disability.DEAFNESS),
+        description = "atividade com interpretação em Libras"
+    )
+    object Mobility : ServiceType(
+        provider = Provider.MONITOR,
+        disability = mutableSetOf(Disability.MOBILITY_IMPAIRED, Disability.PHYSICAL_DISABILITY, Disability.BLINDED),
+        description = "ajuda na mobilidade"
+    ) {
         val monitorAssistanceType = MonitorAssistanceType.MOBILITY_MONITOR
     }
-    object AudioDescription: ServiceType(provider = Provider.COMMITTEE_MEMBER, disability = mutableSetOf(Disability.BLINDED))
-    object NeurodivergentSupport: ServiceType(provider = Provider.MONITOR, disability = mutableSetOf(Disability.NEURODIVERGENT)) {
+
+    object AudioDescription : ServiceType(
+        provider = Provider.COMMITTEE_MEMBER,
+        disability = mutableSetOf(Disability.BLINDED),
+        description = "programação com audiodescrição"
+    )
+
+    object NeurodivergentSupport : ServiceType(
+        provider = Provider.MONITOR,
+        disability = mutableSetOf(Disability.NEURODIVERGENT),
+        description = "suporte para pessoas neurodivergentes"
+    ) {
         val monitorAssistanceType = MonitorAssistanceType.NEURODIVERGENT_SUPPORT_MONITOR
     }
-    object GuideInterpreter: ServiceType(provider = Provider.COMMITTEE_MEMBER, disability = mutableSetOf(Disability.DEAFBLINDNESS))
-    object HygieneAndNutrition: ServiceType(provider = Provider.COMMITTEE_MEMBER, disability = mutableSetOf(Disability.MOBILITY_IMPAIRED, Disability.PHYSICAL_DISABILITY))
-    object Car : ServiceType(provider = Provider.COMMITTEE_MEMBER, disability = mutableSetOf(Disability.PHYSICAL_DISABILITY, Disability.MOBILITY_IMPAIRED
-        ));
-    fun getServicesByDisability(disability: Disability): List<ServiceType> {
-        return ServiceType::class.sealedSubclasses.mapNotNull{ it.objectInstance }.filter{ disability in it.disability }
+
+    object GuideInterpreter : ServiceType(
+        provider = Provider.COMMITTEE_MEMBER,
+        disability = mutableSetOf(Disability.DEAFBLINDNESS),
+        description = "guia-intérprete"
+    )
+
+    object HygieneAndNutrition : ServiceType(
+        provider = Provider.COMMITTEE_MEMBER,
+        disability = mutableSetOf(Disability.MOBILITY_IMPAIRED, Disability.PHYSICAL_DISABILITY),
+        description = "ajuda com alimentação e higiene"
+    )
+
+    object Car : ServiceType(
+        provider = Provider.COMMITTEE_MEMBER,
+        disability = mutableSetOf(Disability.PHYSICAL_DISABILITY, Disability.MOBILITY_IMPAIRED),
+        description = "transporte para deslocamento no evento"
+    )
+
+    companion object {
+        @JvmStatic
+        fun getServicesByDisability(disability: Disability): List<ServiceType> {
+            return ServiceType::class.sealedSubclasses
+                .mapNotNull { it.objectInstance }
+                .filter { disability in it.disability }
+        }
     }
 }

src/main/kotlin/ufrpe/sbpc/botpcd/entity/User.kt

@@ -25,6 +25,5 @@ abstract class User(
     var id: Long? = null,
     var name: String? = null,
     @NotEmpty(message = "The User needs to have a phone number")
-    var phoneNumber: String,
-    var phoneNumberId: String? = null
+    var phoneNumber: String
 )

src/main/kotlin/ufrpe/sbpc/botpcd/entity/UserStatus.kt

@@ -0,0 +1,12 @@
+package ufrpe.sbpc.botpcd.entity
+
+/* 
+(DISPONIVEL) ele pode receber um atendimento
+(OCUPADO) ele esta em atendimento, mas quando finalizar o codigo trocara para disponivel
+(INDISPONIVEL) ele foi ao banheiro / esta ocupado. Nao vai receber chamado ate que altere seu status manualmente para available
+*/
+enum class UserStatus(val text: String) {
+    AVAILABLE("Disponível"), 
+    BUSY("Ocupado"), 
+    UNAVAILABLE("Indisponível") 
+}

src/main/kotlin/ufrpe/sbpc/botpcd/repository/AttendanceRepository.kt

@@ -0,0 +1,6 @@
+package ufrpe.sbpc.botpcd.repository
+
+import org.springframework.data.jpa.repository.JpaRepository
+import ufrpe.sbpc.botpcd.entity.Attendance
+
+interface AttendanceRepository : JpaRepository<Attendance, Long>

src/main/kotlin/ufrpe/sbpc/botpcd/repository/CommitteeMemberRepository.kt

@@ -2,7 +2,9 @@ package ufrpe.sbpc.botpcd.repository
 
 import org.springframework.data.jpa.repository.JpaRepository
 import ufrpe.sbpc.botpcd.entity.CommitteeMember
+import ufrpe.sbpc.botpcd.entity.UserStatus
 
 interface CommitteeMemberRepository: JpaRepository<CommitteeMember, Long> {
     fun findByPhoneNumber(phoneNumber: String): CommitteeMember?
+    fun findByStatus(status: UserStatus): List<CommitteeMember>
 }

src/main/kotlin/ufrpe/sbpc/botpcd/repository/MessageExchangeRepository.kt

@@ -0,0 +1,12 @@
+package ufrpe.sbpc.botpcd.repository
+
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+import ufrpe.sbpc.botpcd.entity.MessageExchange
+
+interface MessageExchangeRepository: JpaRepository<MessageExchange, Long> {
+    @Query(
+        "SELECT m FROM MessageExchange m WHERE m.toPhoneNumber = :toPhoneNumber AND m.fromPhoneNumber = :fromPhoneNumber ORDER BY m.createAt DESC LIMIT 1"
+    )
+    fun lastExchangeMessage(toPhoneNumber: String, fromPhoneNumber: String): MessageExchange?
+}