From 1c9ca4cfa29805d6189da3d209a02c1e9342b8d5 Mon Sep 17 00:00:00 2001 From: oskar Date: Fri, 9 Jan 2026 18:35:06 +0100 Subject: [PATCH] init backend --- back001/.gitignore | 28 ++ back001/README.md | 46 ++++ back001/app/build.gradle.kts | 36 +++ .../kotlin/com/mosenioring/app/Application.kt | 17 ++ .../mosenioring/app/config/MessagingConfig.kt | 33 +++ .../mosenioring/app/config/SecurityConfig.kt | 34 +++ .../mosenioring/app/outbox/OutboxPublisher.kt | 43 +++ .../app/src/main/resources/application.yml | 81 ++++++ .../main/resources/db/migration/V1__init.sql | 141 ++++++++++ back001/build.gradle.kts | 55 ++++ back001/common/build.gradle.kts | 24 ++ .../com/mosenioring/common/BaseEntity.kt | 38 +++ .../kotlin/com/mosenioring/common/Events.kt | 10 + .../mosenioring/common/outbox/OutboxEvent.kt | 24 ++ .../common/outbox/OutboxRepository.kt | 7 + .../common/outbox/OutboxService.kt | 28 ++ .../common/security/LocalAuthFilter.kt | 34 +++ .../common/security/PatientAccess.kt | 8 + .../common/security/PatientAccessChecker.kt | 26 ++ .../common/security/SecurityUtils.kt | 35 +++ .../common/tenant/TenantContext.kt | 38 +++ .../mosenioring/common/tenant/TenantFilter.kt | 30 +++ .../mosenioring/common/web/PageResponse.kt | 8 + .../common/web/ProblemDetailsAdvice.kt | 54 ++++ .../common/PatientAccessCheckerTest.kt | 54 ++++ .../mosenioring/common/TenantContextTest.kt | 29 ++ back001/docker-compose.yml | 61 +++++ back001/docker/keycloak/realm.json | 31 +++ back001/gradle.properties | 2 + back001/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + back001/gradlew | 249 ++++++++++++++++++ back001/gradlew.bat | 92 +++++++ back001/modules/audit/build.gradle.kts | 12 + .../com/mosenioring/audit/AuditEvent.kt | 30 +++ .../com/mosenioring/audit/AuditRepository.kt | 5 + .../mosenioring/audit/service/AuditService.kt | 28 ++ back001/modules/clinical/build.gradle.kts | 14 + .../mosenioring/clinical/MedicationPlan.kt | 21 ++ .../com/mosenioring/clinical/TestOrder.kt | 24 ++ .../clinical/api/ClinicalController.kt | 45 ++++ .../clinical/repo/ClinicalRepositories.kt | 13 + .../clinical/service/ClinicalServices.kt | 64 +++++ back001/modules/identity/build.gradle.kts | 14 + .../com/mosenioring/identity/Patient.kt | 18 ++ .../mosenioring/identity/PatientCaregiver.kt | 21 ++ .../com/mosenioring/identity/PatientDoctor.kt | 21 ++ .../kotlin/com/mosenioring/identity/Tenant.kt | 18 ++ .../kotlin/com/mosenioring/identity/User.kt | 24 ++ .../identity/api/IdentityController.kt | 70 +++++ .../identity/repo/IdentityRepositories.kt | 22 ++ .../repo/PatientRelationshipRepositoryImpl.kt | 16 ++ .../identity/service/IdentityServices.kt | 97 +++++++ back001/modules/integrations/build.gradle.kts | 13 + .../mosenioring/integrations/FileMetadata.kt | 27 ++ .../integrations/api/FilesController.kt | 32 +++ .../integrations/repo/FileRepository.kt | 8 + .../integrations/service/FhirGateway.kt | 10 + .../integrations/service/FileService.kt | 90 +++++++ back001/modules/messaging/build.gradle.kts | 14 + .../com/mosenioring/messaging/Message.kt | 24 ++ .../messaging/api/MessagingController.kt | 28 ++ .../messaging/repo/MessageRepository.kt | 6 + .../messaging/service/MessageService.kt | 31 +++ .../modules/notifications/build.gradle.kts | 13 + .../api/NotificationsController.kt | 25 ++ .../service/NotificationService.kt | 30 +++ back001/requests.http | 55 ++++ back001/settings.gradle.kts | 13 + .../notification-worker/build.gradle.kts | 16 ++ .../worker/NotificationListener.kt | 41 +++ .../worker/NotificationWorkerApplication.kt | 11 + .../worker/WorkerMessagingConfig.kt | 23 ++ .../src/main/resources/application.yml | 30 +++ 74 files changed, 2520 insertions(+) create mode 100644 back001/.gitignore create mode 100644 back001/README.md create mode 100644 back001/app/build.gradle.kts create mode 100644 back001/app/src/main/kotlin/com/mosenioring/app/Application.kt create mode 100644 back001/app/src/main/kotlin/com/mosenioring/app/config/MessagingConfig.kt create mode 100644 back001/app/src/main/kotlin/com/mosenioring/app/config/SecurityConfig.kt create mode 100644 back001/app/src/main/kotlin/com/mosenioring/app/outbox/OutboxPublisher.kt create mode 100644 back001/app/src/main/resources/application.yml create mode 100644 back001/app/src/main/resources/db/migration/V1__init.sql create mode 100644 back001/build.gradle.kts create mode 100644 back001/common/build.gradle.kts create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/BaseEntity.kt create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/Events.kt create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/outbox/OutboxEvent.kt create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/outbox/OutboxRepository.kt create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/outbox/OutboxService.kt create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/security/LocalAuthFilter.kt create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/security/PatientAccess.kt create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/security/PatientAccessChecker.kt create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/security/SecurityUtils.kt create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/tenant/TenantContext.kt create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/tenant/TenantFilter.kt create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/web/PageResponse.kt create mode 100644 back001/common/src/main/kotlin/com/mosenioring/common/web/ProblemDetailsAdvice.kt create mode 100644 back001/common/src/test/kotlin/com/mosenioring/common/PatientAccessCheckerTest.kt create mode 100644 back001/common/src/test/kotlin/com/mosenioring/common/TenantContextTest.kt create mode 100644 back001/docker-compose.yml create mode 100644 back001/docker/keycloak/realm.json create mode 100644 back001/gradle.properties create mode 100644 back001/gradle/wrapper/gradle-wrapper.jar create mode 100644 back001/gradle/wrapper/gradle-wrapper.properties create mode 100755 back001/gradlew create mode 100644 back001/gradlew.bat create mode 100644 back001/modules/audit/build.gradle.kts create mode 100644 back001/modules/audit/src/main/kotlin/com/mosenioring/audit/AuditEvent.kt create mode 100644 back001/modules/audit/src/main/kotlin/com/mosenioring/audit/AuditRepository.kt create mode 100644 back001/modules/audit/src/main/kotlin/com/mosenioring/audit/service/AuditService.kt create mode 100644 back001/modules/clinical/build.gradle.kts create mode 100644 back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/MedicationPlan.kt create mode 100644 back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/TestOrder.kt create mode 100644 back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/api/ClinicalController.kt create mode 100644 back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/repo/ClinicalRepositories.kt create mode 100644 back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/service/ClinicalServices.kt create mode 100644 back001/modules/identity/build.gradle.kts create mode 100644 back001/modules/identity/src/main/kotlin/com/mosenioring/identity/Patient.kt create mode 100644 back001/modules/identity/src/main/kotlin/com/mosenioring/identity/PatientCaregiver.kt create mode 100644 back001/modules/identity/src/main/kotlin/com/mosenioring/identity/PatientDoctor.kt create mode 100644 back001/modules/identity/src/main/kotlin/com/mosenioring/identity/Tenant.kt create mode 100644 back001/modules/identity/src/main/kotlin/com/mosenioring/identity/User.kt create mode 100644 back001/modules/identity/src/main/kotlin/com/mosenioring/identity/api/IdentityController.kt create mode 100644 back001/modules/identity/src/main/kotlin/com/mosenioring/identity/repo/IdentityRepositories.kt create mode 100644 back001/modules/identity/src/main/kotlin/com/mosenioring/identity/repo/PatientRelationshipRepositoryImpl.kt create mode 100644 back001/modules/identity/src/main/kotlin/com/mosenioring/identity/service/IdentityServices.kt create mode 100644 back001/modules/integrations/build.gradle.kts create mode 100644 back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/FileMetadata.kt create mode 100644 back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/api/FilesController.kt create mode 100644 back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/repo/FileRepository.kt create mode 100644 back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/service/FhirGateway.kt create mode 100644 back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/service/FileService.kt create mode 100644 back001/modules/messaging/build.gradle.kts create mode 100644 back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/Message.kt create mode 100644 back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/api/MessagingController.kt create mode 100644 back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/repo/MessageRepository.kt create mode 100644 back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/service/MessageService.kt create mode 100644 back001/modules/notifications/build.gradle.kts create mode 100644 back001/modules/notifications/src/main/kotlin/com/mosenioring/notifications/api/NotificationsController.kt create mode 100644 back001/modules/notifications/src/main/kotlin/com/mosenioring/notifications/service/NotificationService.kt create mode 100644 back001/requests.http create mode 100644 back001/settings.gradle.kts create mode 100644 back001/workers/notification-worker/build.gradle.kts create mode 100644 back001/workers/notification-worker/src/main/kotlin/com/mosenioring/worker/NotificationListener.kt create mode 100644 back001/workers/notification-worker/src/main/kotlin/com/mosenioring/worker/NotificationWorkerApplication.kt create mode 100644 back001/workers/notification-worker/src/main/kotlin/com/mosenioring/worker/WorkerMessagingConfig.kt create mode 100644 back001/workers/notification-worker/src/main/resources/application.yml diff --git a/back001/.gitignore b/back001/.gitignore new file mode 100644 index 0000000..ca51a52 --- /dev/null +++ b/back001/.gitignore @@ -0,0 +1,28 @@ +# Gradle +.gradle/ +build/ +**/build/ + +# IntelliJ IDEA +.idea/ +*.iml +*.ipr +*.iws +out/ + +# Kotlin +*.class + +# Logs +*.log + +# OS +.DS_Store +Thumbs.db + +# Env/local +.env +.env.* + +# Wrapper cache +.gradle-wrapper/ diff --git a/back001/README.md b/back001/README.md new file mode 100644 index 0000000..b5d45e9 --- /dev/null +++ b/back001/README.md @@ -0,0 +1,46 @@ +# Mosenioring Backend + +Production-ready Kotlin/Spring Boot 3 modular monolith skeleton for patient-caregiver-doctor coordination. + +## Requirements +- Java 21 +- Docker + Docker Compose + +## Local Dev +1) Start dependencies: + +```bash +docker compose up -d +``` + +2) Run the API: + +```bash +./gradlew :app:bootRun -Dspring.profiles.active=local +``` + +3) Run the worker: + +```bash +./gradlew :workers:notification-worker:bootRun +``` + +## Auth (local profile) +For local development, add headers: +- `X-Local-User`: user id +- `X-Local-Tenant`: tenant id +- `X-Local-Roles`: comma-separated roles (ADMIN, DOCTOR, CAREGIVER) + +## OpenAPI +- http://localhost:8080/swagger-ui/index.html + +## Key services +- Postgres: localhost:5432 (mosenioring/mosenioring) +- Keycloak: http://localhost:8081 (admin/admin) +- RabbitMQ: http://localhost:15672 (guest/guest) +- MinIO: http://localhost:9001 (minio/minio123) + +## Notes +- Tenant ID is enforced via `TenantFilter` using JWT claim `tenant_id`, or `X-Tenant-Id` header (local). +- Medication plan creation publishes a `MedicationPlanCreated` outbox event. +- Worker consumes and emits `NotificationRequested` events with idempotency via Redis. diff --git a/back001/app/build.gradle.kts b/back001/app/build.gradle.kts new file mode 100644 index 0000000..87ed9c3 --- /dev/null +++ b/back001/app/build.gradle.kts @@ -0,0 +1,36 @@ +plugins { + kotlin("jvm") + kotlin("plugin.spring") + kotlin("plugin.jpa") + id("org.springframework.boot") + id("io.spring.dependency-management") +} + +dependencies { + implementation(project(":common")) + implementation(project(":modules:identity")) + implementation(project(":modules:clinical")) + implementation(project(":modules:messaging")) + implementation(project(":modules:notifications")) + implementation(project(":modules:audit")) + implementation(project(":modules:integrations")) + + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-security") + implementation("org.springframework.boot:spring-boot-starter-validation") + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.springframework.boot:spring-boot-starter-amqp") + implementation("org.springframework.boot:spring-boot-starter-actuator") + implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server") + implementation("org.springframework.boot:spring-boot-starter-data-redis") + implementation("org.flywaydb:flyway-core") + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0") + implementation("io.micrometer:micrometer-registry-prometheus") + implementation("io.micrometer:micrometer-tracing-bridge-otel") + implementation("io.opentelemetry:opentelemetry-exporter-otlp:1.38.0") + implementation("software.amazon.awssdk:s3:2.25.63") + + runtimeOnly("org.postgresql:postgresql") + + testImplementation("org.springframework.boot:spring-boot-starter-test") +} diff --git a/back001/app/src/main/kotlin/com/mosenioring/app/Application.kt b/back001/app/src/main/kotlin/com/mosenioring/app/Application.kt new file mode 100644 index 0000000..11b62d2 --- /dev/null +++ b/back001/app/src/main/kotlin/com/mosenioring/app/Application.kt @@ -0,0 +1,17 @@ +package com.mosenioring.app + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication +import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.scheduling.annotation.EnableScheduling + +@SpringBootApplication(scanBasePackages = ["com.mosenioring"]) +@EntityScan("com.mosenioring") +@EnableJpaRepositories("com.mosenioring") +@EnableScheduling +class Application + +fun main(args: Array) { + runApplication(*args) +} diff --git a/back001/app/src/main/kotlin/com/mosenioring/app/config/MessagingConfig.kt b/back001/app/src/main/kotlin/com/mosenioring/app/config/MessagingConfig.kt new file mode 100644 index 0000000..ff559c7 --- /dev/null +++ b/back001/app/src/main/kotlin/com/mosenioring/app/config/MessagingConfig.kt @@ -0,0 +1,33 @@ +package com.mosenioring.app.config + +import com.mosenioring.common.Events +import org.springframework.amqp.core.Binding +import org.springframework.amqp.core.BindingBuilder +import org.springframework.amqp.core.DirectExchange +import org.springframework.amqp.core.Queue +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration + +@Configuration +class MessagingConfig { + + @Bean + fun medicationExchange(): DirectExchange = DirectExchange(Events.MEDICATION_EXCHANGE) + + @Bean + fun notificationExchange(): DirectExchange = DirectExchange(Events.NOTIFICATION_EXCHANGE) + + @Bean + fun medicationQueue(): Queue = Queue(Events.MEDICATION_QUEUE, true) + + @Bean + fun notificationQueue(): Queue = Queue(Events.NOTIFICATION_QUEUE, true) + + @Bean + fun medicationBinding(medicationExchange: DirectExchange, medicationQueue: Queue): Binding = + BindingBuilder.bind(medicationQueue).to(medicationExchange).with(Events.MEDICATION_PLAN_CREATED) + + @Bean + fun notificationBinding(notificationExchange: DirectExchange, notificationQueue: Queue): Binding = + BindingBuilder.bind(notificationQueue).to(notificationExchange).with(Events.NOTIFICATION_REQUESTED) +} diff --git a/back001/app/src/main/kotlin/com/mosenioring/app/config/SecurityConfig.kt b/back001/app/src/main/kotlin/com/mosenioring/app/config/SecurityConfig.kt new file mode 100644 index 0000000..f1584be --- /dev/null +++ b/back001/app/src/main/kotlin/com/mosenioring/app/config/SecurityConfig.kt @@ -0,0 +1,34 @@ +package com.mosenioring.app.config + +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.http.HttpMethod +import com.mosenioring.common.security.LocalAuthFilter +import org.springframework.security.config.Customizer.withDefaults +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity +import org.springframework.security.config.annotation.web.builders.HttpSecurity +import org.springframework.security.web.SecurityFilterChain +import org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationFilter +import org.springframework.beans.factory.ObjectProvider + +@Configuration +@EnableMethodSecurity +class SecurityConfig { + + @Bean + fun filterChain(http: HttpSecurity, localAuthFilterProvider: ObjectProvider): SecurityFilterChain { + http + .csrf { it.disable() } + .authorizeHttpRequests { + it.requestMatchers("/actuator/**", "/v3/api-docs/**", "/swagger-ui/**").permitAll() + it.requestMatchers(HttpMethod.POST, "/api/v1/tenants").hasRole("ADMIN") + it.anyRequest().authenticated() + } + .oauth2ResourceServer { it.jwt(withDefaults()) } + val localAuthFilter = localAuthFilterProvider.ifAvailable + if (localAuthFilter != null) { + http.addFilterBefore(localAuthFilter, BearerTokenAuthenticationFilter::class.java) + } + return http.build() + } +} diff --git a/back001/app/src/main/kotlin/com/mosenioring/app/outbox/OutboxPublisher.kt b/back001/app/src/main/kotlin/com/mosenioring/app/outbox/OutboxPublisher.kt new file mode 100644 index 0000000..3f9ae2c --- /dev/null +++ b/back001/app/src/main/kotlin/com/mosenioring/app/outbox/OutboxPublisher.kt @@ -0,0 +1,43 @@ +package com.mosenioring.app.outbox + +import com.mosenioring.common.Events +import com.mosenioring.common.outbox.OutboxRepository +import org.slf4j.LoggerFactory +import org.springframework.amqp.rabbit.core.RabbitTemplate +import org.springframework.beans.factory.annotation.Value +import org.springframework.scheduling.annotation.Scheduled +import org.springframework.stereotype.Component +import org.springframework.transaction.annotation.Transactional + +@Component +class OutboxPublisher( + private val repository: OutboxRepository, + private val rabbitTemplate: RabbitTemplate, + @Value("\${app.outbox.publish-delay-ms:2000}") private val publishDelayMs: Long +) { + private val logger = LoggerFactory.getLogger(javaClass) + + @Scheduled(fixedDelayString = "\${app.outbox.publish-delay-ms:2000}") + @Transactional + fun publishPending() { + val pending = repository.findTop50ByStatusOrderByCreatedAtAsc("PENDING") + if (pending.isEmpty()) { + return + } + pending.forEach { event -> + val exchange = when (event.eventType) { + Events.MEDICATION_PLAN_CREATED -> Events.MEDICATION_EXCHANGE + Events.NOTIFICATION_REQUESTED -> Events.NOTIFICATION_EXCHANGE + else -> null + } + if (exchange == null) { + logger.warn("Unknown event type {}", event.eventType) + event.status = "FAILED" + return@forEach + } + rabbitTemplate.convertAndSend(exchange, event.eventType, event.payload) + event.status = "PUBLISHED" + } + repository.saveAll(pending) + } +} diff --git a/back001/app/src/main/resources/application.yml b/back001/app/src/main/resources/application.yml new file mode 100644 index 0000000..359f0cc --- /dev/null +++ b/back001/app/src/main/resources/application.yml @@ -0,0 +1,81 @@ +spring: + application: + name: mosenioring-backend + datasource: + url: jdbc:postgresql://localhost:5432/mosenioring + username: mosenioring + password: mosenioring + jpa: + open-in-view: false + hibernate: + ddl-auto: validate + properties: + hibernate: + jdbc: + time_zone: UTC + flyway: + enabled: true + rabbitmq: + host: localhost + port: 5672 + username: guest + password: guest + data: + redis: + host: localhost + port: 6379 + security: + oauth2: + resourceserver: + jwt: + issuer-uri: http://localhost:8081/realms/mosenioring + +storage: + s3: + endpoint: http://localhost:9000 + region: us-east-1 + access-key: minio + secret-key: minio123 + bucket: mosenioring + +app: + outbox: + publish-delay-ms: 2000 + tenant: + header: X-Tenant-Id + +management: + endpoints: + web: + exposure: + include: health,info,prometheus + tracing: + sampling: + probability: 1.0 + +logging: + level: + root: INFO + +--- +spring: + config: + activate: + on-profile: local + security: + oauth2: + resourceserver: + jwt: + issuer-uri: http://localhost:8081/realms/mosenioring + +app: + security: + local-auth-enabled: true + +--- +spring: + config: + activate: + on-profile: dev + datasource: + url: jdbc:postgresql://localhost:5432/mosenioring diff --git a/back001/app/src/main/resources/db/migration/V1__init.sql b/back001/app/src/main/resources/db/migration/V1__init.sql new file mode 100644 index 0000000..87e1860 --- /dev/null +++ b/back001/app/src/main/resources/db/migration/V1__init.sql @@ -0,0 +1,141 @@ +create table tenants ( + id varchar(64) primary key, + name varchar(255) not null, + tenant_id varchar(64) not null, + created_at timestamptz not null, + updated_at timestamptz not null, + created_by varchar(128), + updated_by varchar(128) +); + +create table users ( + id varchar(64) primary key, + email varchar(255) not null, + role varchar(64) not null, + status varchar(32) not null, + tenant_id varchar(64) not null, + created_at timestamptz not null, + updated_at timestamptz not null, + created_by varchar(128), + updated_by varchar(128) +); + +create table patients ( + id varchar(64) primary key, + full_name varchar(255) not null, + tenant_id varchar(64) not null, + created_at timestamptz not null, + updated_at timestamptz not null, + created_by varchar(128), + updated_by varchar(128) +); + +create table patient_caregivers ( + id varchar(64) primary key, + patient_id varchar(64) not null, + user_id varchar(64) not null, + tenant_id varchar(64) not null, + created_at timestamptz not null, + updated_at timestamptz not null, + created_by varchar(128), + updated_by varchar(128) +); + +create table patient_doctors ( + id varchar(64) primary key, + patient_id varchar(64) not null, + user_id varchar(64) not null, + tenant_id varchar(64) not null, + created_at timestamptz not null, + updated_at timestamptz not null, + created_by varchar(128), + updated_by varchar(128) +); + +create table medication_plans ( + id varchar(64) primary key, + patient_id varchar(64) not null, + description text not null, + tenant_id varchar(64) not null, + created_at timestamptz not null, + updated_at timestamptz not null, + created_by varchar(128), + updated_by varchar(128) +); + +create table tests ( + id varchar(64) primary key, + patient_id varchar(64) not null, + test_name varchar(255) not null, + status varchar(64) not null, + tenant_id varchar(64) not null, + created_at timestamptz not null, + updated_at timestamptz not null, + created_by varchar(128), + updated_by varchar(128) +); + +create table messages ( + id varchar(64) primary key, + patient_id varchar(64) not null, + sender_id varchar(64) not null, + body text not null, + tenant_id varchar(64) not null, + created_at timestamptz not null, + updated_at timestamptz not null, + created_by varchar(128), + updated_by varchar(128) +); + +create table files ( + id varchar(64) primary key, + patient_id varchar(64), + file_name varchar(255) not null, + content_type varchar(255) not null, + storage_key varchar(512) not null, + tenant_id varchar(64) not null, + created_at timestamptz not null, + updated_at timestamptz not null, + created_by varchar(128), + updated_by varchar(128) +); + +create table audit_events ( + id varchar(64) primary key, + actor_id varchar(128) not null, + action varchar(128) not null, + resource varchar(128) not null, + resource_id varchar(64), + patient_id varchar(64), + tenant_id varchar(64) not null, + created_at timestamptz not null, + updated_at timestamptz not null, + created_by varchar(128), + updated_by varchar(128) +); + +create table outbox_events ( + id varchar(64) primary key, + event_type varchar(128) not null, + payload text not null, + status varchar(32) not null, + tenant_id varchar(64) not null, + created_at timestamptz not null, + updated_at timestamptz not null, + created_by varchar(128), + updated_by varchar(128) +); + +create index idx_users_tenant on users(tenant_id); +create index idx_patients_tenant on patients(tenant_id); +create index idx_patient_caregivers_tenant on patient_caregivers(tenant_id); +create index idx_patient_doctors_tenant on patient_doctors(tenant_id); +create index idx_medication_plans_tenant on medication_plans(tenant_id); +create index idx_tests_tenant on tests(tenant_id); +create index idx_messages_tenant on messages(tenant_id); +create index idx_files_tenant on files(tenant_id); +create index idx_audit_events_tenant on audit_events(tenant_id); +create index idx_outbox_events_tenant on outbox_events(tenant_id); + +create unique index idx_patient_caregivers_unique on patient_caregivers(tenant_id, patient_id, user_id); +create unique index idx_patient_doctors_unique on patient_doctors(tenant_id, patient_id, user_id); diff --git a/back001/build.gradle.kts b/back001/build.gradle.kts new file mode 100644 index 0000000..06557c2 --- /dev/null +++ b/back001/build.gradle.kts @@ -0,0 +1,55 @@ +import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension +import org.gradle.api.plugins.JavaPluginExtension +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + kotlin("jvm") version "1.9.23" apply false + kotlin("plugin.spring") version "1.9.23" apply false + kotlin("plugin.jpa") version "1.9.23" apply false + id("org.springframework.boot") version "3.2.5" apply false + id("io.spring.dependency-management") version "1.1.4" apply false +} + +allprojects { + group = "com.mosenioring" + version = "0.1.0" + + repositories { + mavenCentral() + } +} + +subprojects { + plugins.withId("io.spring.dependency-management") { + the().apply { + imports { + mavenBom("org.springframework.boot:spring-boot-dependencies:3.2.5") + } + } + } + + tasks.withType { + kotlinOptions { + jvmTarget = "21" + freeCompilerArgs = listOf("-Xjsr305=strict") + } + } + + plugins.withId("java") { + extensions.configure { + toolchain { + languageVersion.set(JavaLanguageVersion.of(21)) + } + } + } + + plugins.withId("org.jetbrains.kotlin.jvm") { + extensions.configure { + jvmToolchain(21) + } + } + + tasks.withType { + useJUnitPlatform() + } +} diff --git a/back001/common/build.gradle.kts b/back001/common/build.gradle.kts new file mode 100644 index 0000000..942b203 --- /dev/null +++ b/back001/common/build.gradle.kts @@ -0,0 +1,24 @@ +plugins { + kotlin("jvm") + kotlin("plugin.spring") + kotlin("plugin.jpa") + id("io.spring.dependency-management") + id("java-library") +} + +dependencies { + api("org.springframework.boot:spring-boot-starter-web") + api("org.springframework.boot:spring-boot-starter-security") + api("org.springframework.boot:spring-boot-starter-data-jpa") + api("org.springframework.boot:spring-boot-starter-validation") + api("org.springframework.boot:spring-boot-starter-actuator") + api("org.springframework.security:spring-security-oauth2-resource-server") + api("org.springframework.security:spring-security-oauth2-jose") + api("com.fasterxml.jackson.module:jackson-module-kotlin") + api("org.jetbrains.kotlin:kotlin-reflect") + api("io.opentelemetry:opentelemetry-api:1.38.0") + api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") + + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.mockito:mockito-core:5.12.0") +} diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/BaseEntity.kt b/back001/common/src/main/kotlin/com/mosenioring/common/BaseEntity.kt new file mode 100644 index 0000000..03cd468 --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/BaseEntity.kt @@ -0,0 +1,38 @@ +package com.mosenioring.common + +import jakarta.persistence.Column +import jakarta.persistence.MappedSuperclass +import jakarta.persistence.PrePersist +import jakarta.persistence.PreUpdate +import java.time.Instant + +@MappedSuperclass +abstract class BaseEntity { + + @Column(name = "tenant_id", nullable = false, updatable = false) + lateinit var tenantId: String + + @Column(name = "created_at", nullable = false, updatable = false) + lateinit var createdAt: Instant + + @Column(name = "updated_at", nullable = false) + lateinit var updatedAt: Instant + + @Column(name = "created_by") + var createdBy: String? = null + + @Column(name = "updated_by") + var updatedBy: String? = null + + @PrePersist + fun onCreate() { + val now = Instant.now() + createdAt = now + updatedAt = now + } + + @PreUpdate + fun onUpdate() { + updatedAt = Instant.now() + } +} diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/Events.kt b/back001/common/src/main/kotlin/com/mosenioring/common/Events.kt new file mode 100644 index 0000000..1f67f87 --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/Events.kt @@ -0,0 +1,10 @@ +package com.mosenioring.common + +object Events { + const val MEDICATION_PLAN_CREATED = "MedicationPlanCreated" + const val NOTIFICATION_REQUESTED = "NotificationRequested" + const val MEDICATION_EXCHANGE = "medication.events" + const val NOTIFICATION_EXCHANGE = "notification.events" + const val MEDICATION_QUEUE = "medication.plan.created" + const val NOTIFICATION_QUEUE = "notification.requested" +} diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/outbox/OutboxEvent.kt b/back001/common/src/main/kotlin/com/mosenioring/common/outbox/OutboxEvent.kt new file mode 100644 index 0000000..ec9113e --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/outbox/OutboxEvent.kt @@ -0,0 +1,24 @@ +package com.mosenioring.common.outbox + +import com.mosenioring.common.BaseEntity +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name = "outbox_events") +class OutboxEvent( + @Id + @Column(name = "id") + val id: String, + + @Column(name = "event_type", nullable = false) + val eventType: String, + + @Column(name = "payload", nullable = false, columnDefinition = "text") + val payload: String, + + @Column(name = "status", nullable = false) + var status: String = "PENDING" +) : BaseEntity() diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/outbox/OutboxRepository.kt b/back001/common/src/main/kotlin/com/mosenioring/common/outbox/OutboxRepository.kt new file mode 100644 index 0000000..798550c --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/outbox/OutboxRepository.kt @@ -0,0 +1,7 @@ +package com.mosenioring.common.outbox + +import org.springframework.data.jpa.repository.JpaRepository + +interface OutboxRepository : JpaRepository { + fun findTop50ByStatusOrderByCreatedAtAsc(status: String): List +} diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/outbox/OutboxService.kt b/back001/common/src/main/kotlin/com/mosenioring/common/outbox/OutboxService.kt new file mode 100644 index 0000000..140a726 --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/outbox/OutboxService.kt @@ -0,0 +1,28 @@ +package com.mosenioring.common.outbox + +import com.fasterxml.jackson.databind.ObjectMapper +import com.mosenioring.common.security.SecurityUtils +import com.mosenioring.common.tenant.TenantContext +import org.springframework.context.annotation.Profile +import org.springframework.stereotype.Service +import java.util.UUID + +@Service +@Profile("!worker") +class OutboxService( + private val repository: OutboxRepository, + private val objectMapper: ObjectMapper +) { + fun enqueue(eventType: String, payload: Any): OutboxEvent { + val tenantId = TenantContext.getTenantId() ?: "unknown" + val event = OutboxEvent( + id = UUID.randomUUID().toString(), + eventType = eventType, + payload = objectMapper.writeValueAsString(payload) + ) + event.tenantId = tenantId + event.createdBy = SecurityUtils.currentUserId() + event.updatedBy = SecurityUtils.currentUserId() + return repository.save(event) + } +} diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/security/LocalAuthFilter.kt b/back001/common/src/main/kotlin/com/mosenioring/common/security/LocalAuthFilter.kt new file mode 100644 index 0000000..ecd04e2 --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/security/LocalAuthFilter.kt @@ -0,0 +1,34 @@ +package com.mosenioring.common.security + +import jakarta.servlet.FilterChain +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import org.springframework.context.annotation.Profile +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken +import org.springframework.security.core.authority.SimpleGrantedAuthority +import org.springframework.security.core.context.SecurityContextHolder +import org.springframework.stereotype.Component +import org.springframework.web.filter.OncePerRequestFilter + +@Component +@Profile("local") +class LocalAuthFilter : OncePerRequestFilter() { + + override fun doFilterInternal( + request: HttpServletRequest, + response: HttpServletResponse, + filterChain: FilterChain + ) { + val userId = request.getHeader("X-Local-User") + val tenantId = request.getHeader("X-Local-Tenant") + val rolesHeader = request.getHeader("X-Local-Roles") + if (!userId.isNullOrBlank() && !tenantId.isNullOrBlank()) { + val roles = rolesHeader?.split(",")?.map { it.trim() }?.filter { it.isNotBlank() }?.toSet() ?: emptySet() + val authorities = roles.map { SimpleGrantedAuthority("ROLE_$it") } + val principal = LocalUserPrincipal(userId, tenantId, roles) + val auth = UsernamePasswordAuthenticationToken(principal, "N/A", authorities) + SecurityContextHolder.getContext().authentication = auth + } + filterChain.doFilter(request, response) + } +} diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/security/PatientAccess.kt b/back001/common/src/main/kotlin/com/mosenioring/common/security/PatientAccess.kt new file mode 100644 index 0000000..7934feb --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/security/PatientAccess.kt @@ -0,0 +1,8 @@ +package com.mosenioring.common.security + +import org.springframework.security.access.prepost.PreAuthorize + +@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS) +@Retention(AnnotationRetention.RUNTIME) +@PreAuthorize("@patientAccessChecker.hasAccess(#patientId)") +annotation class PatientAccess diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/security/PatientAccessChecker.kt b/back001/common/src/main/kotlin/com/mosenioring/common/security/PatientAccessChecker.kt new file mode 100644 index 0000000..7d82fc9 --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/security/PatientAccessChecker.kt @@ -0,0 +1,26 @@ +package com.mosenioring.common.security + +import com.mosenioring.common.tenant.TenantContext +import org.springframework.context.annotation.Profile +import org.springframework.stereotype.Component + +interface PatientRelationshipRepository { + fun isCaregiverOf(tenantId: String, patientId: String, userId: String): Boolean + fun isDoctorOf(tenantId: String, patientId: String, userId: String): Boolean +} + +@Component +@Profile("!worker") +class PatientAccessChecker( + private val relationships: PatientRelationshipRepository +) { + fun hasAccess(patientId: String): Boolean { + val tenantId = TenantContext.getTenantId() ?: return false + if (SecurityUtils.hasRole("ADMIN")) { + return true + } + val userId = SecurityUtils.currentUserId() ?: return false + return relationships.isCaregiverOf(tenantId, patientId, userId) || + relationships.isDoctorOf(tenantId, patientId, userId) + } +} diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/security/SecurityUtils.kt b/back001/common/src/main/kotlin/com/mosenioring/common/security/SecurityUtils.kt new file mode 100644 index 0000000..b30dfb9 --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/security/SecurityUtils.kt @@ -0,0 +1,35 @@ +package com.mosenioring.common.security + +import org.springframework.security.core.Authentication +import org.springframework.security.core.context.SecurityContextHolder +import org.springframework.security.oauth2.jwt.Jwt +import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken + +object SecurityUtils { + fun currentUserId(): String? { + val authentication = SecurityContextHolder.getContext().authentication ?: return null + return when (authentication) { + is JwtAuthenticationToken -> authentication.token.subject + else -> (authentication.principal as? LocalUserPrincipal)?.userId + } + } + + fun currentTenantId(): String? { + val authentication = SecurityContextHolder.getContext().authentication ?: return null + return when (authentication) { + is JwtAuthenticationToken -> authentication.token.getClaimAsString("tenant_id") + else -> (authentication.principal as? LocalUserPrincipal)?.tenantId + } + } + + fun hasRole(role: String, authentication: Authentication? = null): Boolean { + val auth = authentication ?: SecurityContextHolder.getContext().authentication ?: return false + return auth.authorities.any { it.authority == "ROLE_$role" } + } +} + +data class LocalUserPrincipal( + val userId: String, + val tenantId: String, + val roles: Set +) diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/tenant/TenantContext.kt b/back001/common/src/main/kotlin/com/mosenioring/common/tenant/TenantContext.kt new file mode 100644 index 0000000..9f89817 --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/tenant/TenantContext.kt @@ -0,0 +1,38 @@ +package com.mosenioring.common.tenant + +import kotlinx.coroutines.ThreadContextElement +import kotlin.coroutines.AbstractCoroutineContextElement +import kotlin.coroutines.CoroutineContext + +object TenantContext { + private val current = ThreadLocal() + + fun getTenantId(): String? = current.get() + + fun setTenantId(tenantId: String?) { + current.set(tenantId) + } + + fun clear() { + current.remove() + } + + fun asContextElement(tenantId: String?): CoroutineContext = TenantContextElement(tenantId) +} + +class TenantContextElement( + private val tenantId: String? +) : ThreadContextElement, + AbstractCoroutineContextElement(Key) { + companion object Key : CoroutineContext.Key + + override fun updateThreadContext(context: CoroutineContext): String? { + val previous = TenantContext.getTenantId() + TenantContext.setTenantId(tenantId) + return previous + } + + override fun restoreThreadContext(context: CoroutineContext, oldState: String?) { + TenantContext.setTenantId(oldState) + } +} diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/tenant/TenantFilter.kt b/back001/common/src/main/kotlin/com/mosenioring/common/tenant/TenantFilter.kt new file mode 100644 index 0000000..ad50452 --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/tenant/TenantFilter.kt @@ -0,0 +1,30 @@ +package com.mosenioring.common.tenant + +import com.mosenioring.common.security.SecurityUtils +import jakarta.servlet.FilterChain +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import org.springframework.beans.factory.annotation.Value +import org.springframework.stereotype.Component +import org.springframework.web.filter.OncePerRequestFilter + +@Component +class TenantFilter( + @Value("\${app.tenant.header:X-Tenant-Id}") private val tenantHeader: String +) : OncePerRequestFilter() { + + override fun doFilterInternal( + request: HttpServletRequest, + response: HttpServletResponse, + filterChain: FilterChain + ) { + val tenantId = SecurityUtils.currentTenantId() + ?: request.getHeader(tenantHeader) + TenantContext.setTenantId(tenantId) + try { + filterChain.doFilter(request, response) + } finally { + TenantContext.clear() + } + } +} diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/web/PageResponse.kt b/back001/common/src/main/kotlin/com/mosenioring/common/web/PageResponse.kt new file mode 100644 index 0000000..04f4255 --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/web/PageResponse.kt @@ -0,0 +1,8 @@ +package com.mosenioring.common.web + +data class PageResponse( + val items: List, + val page: Int, + val size: Int, + val total: Long +) diff --git a/back001/common/src/main/kotlin/com/mosenioring/common/web/ProblemDetailsAdvice.kt b/back001/common/src/main/kotlin/com/mosenioring/common/web/ProblemDetailsAdvice.kt new file mode 100644 index 0000000..df2193f --- /dev/null +++ b/back001/common/src/main/kotlin/com/mosenioring/common/web/ProblemDetailsAdvice.kt @@ -0,0 +1,54 @@ +package com.mosenioring.common.web + +import jakarta.servlet.http.HttpServletRequest +import org.springframework.http.HttpStatus +import org.springframework.http.ProblemDetail +import org.springframework.validation.FieldError +import org.springframework.web.ErrorResponseException +import org.springframework.web.bind.MethodArgumentNotValidException +import org.springframework.web.bind.annotation.ExceptionHandler +import org.springframework.web.bind.annotation.RestControllerAdvice + +@RestControllerAdvice +class ProblemDetailsAdvice { + + @ExceptionHandler(MethodArgumentNotValidException::class) + fun handleValidation(ex: MethodArgumentNotValidException, request: HttpServletRequest): ProblemDetail { + val detail = ProblemDetail.forStatus(HttpStatus.BAD_REQUEST) + detail.title = "Validation failed" + detail.type = java.net.URI.create("https://httpstatuses.io/400") + detail.setProperty("path", request.requestURI) + detail.setProperty("errors", ex.bindingResult.fieldErrors.map { it.toErrorMap() }) + return detail + } + + @ExceptionHandler(ErrorResponseException::class) + fun handleErrorResponse(ex: ErrorResponseException, request: HttpServletRequest): ProblemDetail { + val detail = ex.body + detail.setProperty("path", request.requestURI) + return detail + } + + @ExceptionHandler(IllegalArgumentException::class) + fun handleIllegalArgument(ex: IllegalArgumentException, request: HttpServletRequest): ProblemDetail { + val detail = ProblemDetail.forStatus(HttpStatus.BAD_REQUEST) + detail.title = "Invalid request" + detail.detail = ex.message + detail.type = java.net.URI.create("https://httpstatuses.io/400") + detail.setProperty("path", request.requestURI) + return detail + } + + @ExceptionHandler(IllegalStateException::class) + fun handleIllegalState(ex: IllegalStateException, request: HttpServletRequest): ProblemDetail { + val detail = ProblemDetail.forStatus(HttpStatus.CONFLICT) + detail.title = "Conflict" + detail.detail = ex.message + detail.type = java.net.URI.create("https://httpstatuses.io/409") + detail.setProperty("path", request.requestURI) + return detail + } + + private fun FieldError.toErrorMap(): Map = + mapOf("field" to field, "message" to (defaultMessage ?: "invalid")) +} diff --git a/back001/common/src/test/kotlin/com/mosenioring/common/PatientAccessCheckerTest.kt b/back001/common/src/test/kotlin/com/mosenioring/common/PatientAccessCheckerTest.kt new file mode 100644 index 0000000..c09882a --- /dev/null +++ b/back001/common/src/test/kotlin/com/mosenioring/common/PatientAccessCheckerTest.kt @@ -0,0 +1,54 @@ +package com.mosenioring.common + +import com.mosenioring.common.security.LocalUserPrincipal +import com.mosenioring.common.security.PatientAccessChecker +import com.mosenioring.common.security.PatientRelationshipRepository +import com.mosenioring.common.tenant.TenantContext +import org.junit.jupiter.api.Assertions.assertFalse +import org.junit.jupiter.api.Assertions.assertTrue +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.mockito.Mockito +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken +import org.springframework.security.core.authority.SimpleGrantedAuthority +import org.springframework.security.core.context.SecurityContextHolder + +class PatientAccessCheckerTest { + + private lateinit var relationships: PatientRelationshipRepository + private lateinit var checker: PatientAccessChecker + + @BeforeEach + fun setup() { + relationships = Mockito.mock(PatientRelationshipRepository::class.java) + checker = PatientAccessChecker(relationships) + TenantContext.setTenantId("t1") + } + + @Test + fun `allows admin`() { + val auth = UsernamePasswordAuthenticationToken("admin", "n/a", listOf(SimpleGrantedAuthority("ROLE_ADMIN"))) + SecurityContextHolder.getContext().authentication = auth + assertTrue(checker.hasAccess("p1")) + } + + @Test + fun `denies when no relationship`() { + val principal = LocalUserPrincipal("user1", "t1", emptySet()) + val auth = UsernamePasswordAuthenticationToken(principal, "n/a", emptyList()) + SecurityContextHolder.getContext().authentication = auth + Mockito.`when`(relationships.isCaregiverOf("t1", "p1", "user1")).thenReturn(false) + Mockito.`when`(relationships.isDoctorOf("t1", "p1", "user1")).thenReturn(false) + assertFalse(checker.hasAccess("p1")) + } + + @Test + fun `allows caregiver relationship`() { + val principal = LocalUserPrincipal("user2", "t1", setOf("CAREGIVER")) + val auth = UsernamePasswordAuthenticationToken(principal, "n/a", emptyList()) + SecurityContextHolder.getContext().authentication = auth + Mockito.`when`(relationships.isCaregiverOf("t1", "p1", "user2")).thenReturn(true) + Mockito.`when`(relationships.isDoctorOf("t1", "p1", "user2")).thenReturn(false) + assertTrue(checker.hasAccess("p1")) + } +} diff --git a/back001/common/src/test/kotlin/com/mosenioring/common/TenantContextTest.kt b/back001/common/src/test/kotlin/com/mosenioring/common/TenantContextTest.kt new file mode 100644 index 0000000..8c7488a --- /dev/null +++ b/back001/common/src/test/kotlin/com/mosenioring/common/TenantContextTest.kt @@ -0,0 +1,29 @@ +package com.mosenioring.common + +import com.mosenioring.common.tenant.TenantContext +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.withContext +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertNull +import org.junit.jupiter.api.Test + +class TenantContextTest { + + @Test + fun `sets and clears tenant context`() { + TenantContext.setTenantId("t1") + assertEquals("t1", TenantContext.getTenantId()) + TenantContext.clear() + assertNull(TenantContext.getTenantId()) + } + + @Test + fun `propagates tenant context to coroutine`() = runBlocking { + TenantContext.setTenantId("t2") + val result = withContext(TenantContext.asContextElement("t2")) { + TenantContext.getTenantId() + } + assertEquals("t2", result) + TenantContext.clear() + } +} diff --git a/back001/docker-compose.yml b/back001/docker-compose.yml new file mode 100644 index 0000000..ce6d3f7 --- /dev/null +++ b/back001/docker-compose.yml @@ -0,0 +1,61 @@ +version: "3.9" + +services: + postgres: + image: postgres:16 + environment: + POSTGRES_DB: mosenioring + POSTGRES_USER: mosenioring + POSTGRES_PASSWORD: mosenioring + ports: + - "5432:5432" + volumes: + - pgdata:/var/lib/postgresql/data + + keycloak: + image: quay.io/keycloak/keycloak:22.0.5 + command: start-dev --import-realm + environment: + KEYCLOAK_ADMIN: admin + KEYCLOAK_ADMIN_PASSWORD: admin + ports: + - "8081:8080" + volumes: + - ./docker/keycloak/realm.json:/opt/keycloak/data/import/realm.json:ro + + rabbitmq: + image: rabbitmq:3.12-management + ports: + - "5672:5672" + - "15672:15672" + + redis: + image: redis:7 + ports: + - "6379:6379" + + minio: + image: minio/minio:RELEASE.2024-04-06T05-26-02Z + environment: + MINIO_ROOT_USER: minio + MINIO_ROOT_PASSWORD: minio123 + command: server /data --console-address ":9001" + ports: + - "9000:9000" + - "9001:9001" + volumes: + - minio:/data + + minio-init: + image: minio/mc:latest + depends_on: + - minio + entrypoint: ["/bin/sh", "-c"] + command: > + "mc alias set local http://minio:9000 minio minio123 && + mc mb -p local/mosenioring && + mc anonymous set public local/mosenioring" + +volumes: + pgdata: + minio: diff --git a/back001/docker/keycloak/realm.json b/back001/docker/keycloak/realm.json new file mode 100644 index 0000000..b656185 --- /dev/null +++ b/back001/docker/keycloak/realm.json @@ -0,0 +1,31 @@ +{ + "realm": "mosenioring", + "enabled": true, + "displayName": "Mosenioring", + "roles": { + "realm": [ + { "name": "ADMIN" }, + { "name": "DOCTOR" }, + { "name": "CAREGIVER" } + ] + }, + "clients": [ + { + "clientId": "mosenioring-backend", + "enabled": true, + "publicClient": true, + "directAccessGrantsEnabled": true, + "standardFlowEnabled": true, + "redirectUris": ["*"] + } + ], + "users": [ + { + "username": "admin", + "enabled": true, + "email": "admin@example.com", + "credentials": [{ "type": "password", "value": "admin", "temporary": false }], + "realmRoles": ["ADMIN"] + } + ] +} diff --git a/back001/gradle.properties b/back001/gradle.properties new file mode 100644 index 0000000..4a42352 --- /dev/null +++ b/back001/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx1g -Dfile.encoding=UTF-8 +kotlin.code.style=official diff --git a/back001/gradle/wrapper/gradle-wrapper.jar b/back001/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/back001/gradlew.bat b/back001/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/back001/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/back001/modules/audit/build.gradle.kts b/back001/modules/audit/build.gradle.kts new file mode 100644 index 0000000..6acd1d2 --- /dev/null +++ b/back001/modules/audit/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + kotlin("jvm") + kotlin("plugin.spring") + kotlin("plugin.jpa") + id("io.spring.dependency-management") + id("java-library") +} + +dependencies { + api(project(":common")) + implementation("org.springframework.boot:spring-boot-starter-data-jpa") +} diff --git a/back001/modules/audit/src/main/kotlin/com/mosenioring/audit/AuditEvent.kt b/back001/modules/audit/src/main/kotlin/com/mosenioring/audit/AuditEvent.kt new file mode 100644 index 0000000..a071758 --- /dev/null +++ b/back001/modules/audit/src/main/kotlin/com/mosenioring/audit/AuditEvent.kt @@ -0,0 +1,30 @@ +package com.mosenioring.audit + +import com.mosenioring.common.BaseEntity +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name = "audit_events") +class AuditEvent( + @Id + @Column(name = "id") + val id: String, + + @Column(name = "actor_id", nullable = false) + val actorId: String, + + @Column(name = "action", nullable = false) + val action: String, + + @Column(name = "resource", nullable = false) + val resource: String, + + @Column(name = "resource_id") + val resourceId: String?, + + @Column(name = "patient_id") + val patientId: String? +) : BaseEntity() diff --git a/back001/modules/audit/src/main/kotlin/com/mosenioring/audit/AuditRepository.kt b/back001/modules/audit/src/main/kotlin/com/mosenioring/audit/AuditRepository.kt new file mode 100644 index 0000000..b5b89d3 --- /dev/null +++ b/back001/modules/audit/src/main/kotlin/com/mosenioring/audit/AuditRepository.kt @@ -0,0 +1,5 @@ +package com.mosenioring.audit + +import org.springframework.data.jpa.repository.JpaRepository + +interface AuditRepository : JpaRepository diff --git a/back001/modules/audit/src/main/kotlin/com/mosenioring/audit/service/AuditService.kt b/back001/modules/audit/src/main/kotlin/com/mosenioring/audit/service/AuditService.kt new file mode 100644 index 0000000..389e02d --- /dev/null +++ b/back001/modules/audit/src/main/kotlin/com/mosenioring/audit/service/AuditService.kt @@ -0,0 +1,28 @@ +package com.mosenioring.audit.service + +import com.mosenioring.audit.AuditEvent +import com.mosenioring.audit.AuditRepository +import com.mosenioring.common.security.SecurityUtils +import com.mosenioring.common.tenant.TenantContext +import org.springframework.stereotype.Service +import java.util.UUID + +@Service +class AuditService( + private val repository: AuditRepository +) { + fun record(action: String, resource: String, resourceId: String?, patientId: String?) { + val event = AuditEvent( + id = UUID.randomUUID().toString(), + actorId = SecurityUtils.currentUserId() ?: "system", + action = action, + resource = resource, + resourceId = resourceId, + patientId = patientId + ) + event.tenantId = TenantContext.getTenantId() ?: "unknown" + event.createdBy = event.actorId + event.updatedBy = event.actorId + repository.save(event) + } +} diff --git a/back001/modules/clinical/build.gradle.kts b/back001/modules/clinical/build.gradle.kts new file mode 100644 index 0000000..22ead93 --- /dev/null +++ b/back001/modules/clinical/build.gradle.kts @@ -0,0 +1,14 @@ +plugins { + kotlin("jvm") + kotlin("plugin.spring") + kotlin("plugin.jpa") + id("io.spring.dependency-management") + id("java-library") +} + +dependencies { + api(project(":common")) + implementation(project(":modules:audit")) + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.springframework.boot:spring-boot-starter-validation") +} diff --git a/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/MedicationPlan.kt b/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/MedicationPlan.kt new file mode 100644 index 0000000..962ad79 --- /dev/null +++ b/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/MedicationPlan.kt @@ -0,0 +1,21 @@ +package com.mosenioring.clinical + +import com.mosenioring.common.BaseEntity +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name = "medication_plans") +class MedicationPlan( + @Id + @Column(name = "id") + val id: String, + + @Column(name = "patient_id", nullable = false) + val patientId: String, + + @Column(name = "description", nullable = false) + val description: String +) : BaseEntity() diff --git a/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/TestOrder.kt b/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/TestOrder.kt new file mode 100644 index 0000000..97263c1 --- /dev/null +++ b/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/TestOrder.kt @@ -0,0 +1,24 @@ +package com.mosenioring.clinical + +import com.mosenioring.common.BaseEntity +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name = "tests") +class TestOrder( + @Id + @Column(name = "id") + val id: String, + + @Column(name = "patient_id", nullable = false) + val patientId: String, + + @Column(name = "test_name", nullable = false) + val testName: String, + + @Column(name = "status", nullable = false) + val status: String +) : BaseEntity() diff --git a/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/api/ClinicalController.kt b/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/api/ClinicalController.kt new file mode 100644 index 0000000..8691e44 --- /dev/null +++ b/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/api/ClinicalController.kt @@ -0,0 +1,45 @@ +package com.mosenioring.clinical.api + +import com.mosenioring.clinical.service.MedicationPlanService +import com.mosenioring.clinical.service.TestOrderService +import jakarta.validation.Valid +import jakarta.validation.constraints.NotBlank +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.* + +@RestController +@RequestMapping("/api/v1") +class ClinicalController( + private val medicationPlanService: MedicationPlanService, + private val testOrderService: TestOrderService +) { + @PostMapping("/patients/{id}/medications") + fun createMedicationPlan( + @PathVariable id: String, + @Valid @RequestBody request: CreateMedicationPlanRequest + ): ResponseEntity { + val plan = medicationPlanService.createMedicationPlan(id, request.description) + return ResponseEntity.ok(MedicationPlanResponse(plan.id, plan.patientId, plan.description)) + } + + @PostMapping("/patients/{id}/tests") + fun createTestOrder( + @PathVariable id: String, + @Valid @RequestBody request: CreateTestOrderRequest + ): ResponseEntity { + val order = testOrderService.createTestOrder(id, request.testName) + return ResponseEntity.ok(TestOrderResponse(order.id, order.patientId, order.testName, order.status)) + } +} + +data class CreateMedicationPlanRequest( + @field:NotBlank val description: String +) + +data class CreateTestOrderRequest( + @field:NotBlank val testName: String +) + +data class MedicationPlanResponse(val id: String, val patientId: String, val description: String) + +data class TestOrderResponse(val id: String, val patientId: String, val testName: String, val status: String) diff --git a/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/repo/ClinicalRepositories.kt b/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/repo/ClinicalRepositories.kt new file mode 100644 index 0000000..0e214c4 --- /dev/null +++ b/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/repo/ClinicalRepositories.kt @@ -0,0 +1,13 @@ +package com.mosenioring.clinical.repo + +import com.mosenioring.clinical.MedicationPlan +import com.mosenioring.clinical.TestOrder +import org.springframework.data.jpa.repository.JpaRepository + +interface MedicationPlanRepository : JpaRepository { + fun findByIdAndTenantId(id: String, tenantId: String): MedicationPlan? +} + +interface TestOrderRepository : JpaRepository { + fun findByIdAndTenantId(id: String, tenantId: String): TestOrder? +} diff --git a/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/service/ClinicalServices.kt b/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/service/ClinicalServices.kt new file mode 100644 index 0000000..b405c14 --- /dev/null +++ b/back001/modules/clinical/src/main/kotlin/com/mosenioring/clinical/service/ClinicalServices.kt @@ -0,0 +1,64 @@ +package com.mosenioring.clinical.service + +import com.mosenioring.audit.service.AuditService +import com.mosenioring.clinical.MedicationPlan +import com.mosenioring.clinical.TestOrder +import com.mosenioring.clinical.repo.MedicationPlanRepository +import com.mosenioring.clinical.repo.TestOrderRepository +import com.mosenioring.common.Events +import com.mosenioring.common.outbox.OutboxService +import com.mosenioring.common.security.PatientAccess +import com.mosenioring.common.security.SecurityUtils +import com.mosenioring.common.tenant.TenantContext +import org.springframework.security.access.prepost.PreAuthorize +import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional +import java.util.UUID + +@Service +class MedicationPlanService( + private val repository: MedicationPlanRepository, + private val outboxService: OutboxService, + private val auditService: AuditService +) { + @Transactional + @PatientAccess + fun createMedicationPlan(patientId: String, description: String): MedicationPlan { + val tenantId = TenantContext.getTenantId() ?: throw IllegalStateException("Missing tenant") + val plan = MedicationPlan(UUID.randomUUID().toString(), patientId, description) + plan.tenantId = tenantId + plan.createdBy = SecurityUtils.currentUserId() + plan.updatedBy = SecurityUtils.currentUserId() + val saved = repository.save(plan) + outboxService.enqueue( + Events.MEDICATION_PLAN_CREATED, + mapOf( + "eventId" to UUID.randomUUID().toString(), + "tenantId" to tenantId, + "patientId" to patientId, + "medicationPlanId" to saved.id + ) + ) + auditService.record("MEDICATION_PLAN_CREATED", "medication_plan", saved.id, patientId) + return saved + } +} + +@Service +class TestOrderService( + private val repository: TestOrderRepository, + private val auditService: AuditService +) { + @Transactional + @PatientAccess + fun createTestOrder(patientId: String, testName: String): TestOrder { + val tenantId = TenantContext.getTenantId() ?: throw IllegalStateException("Missing tenant") + val order = TestOrder(UUID.randomUUID().toString(), patientId, testName, "ORDERED") + order.tenantId = tenantId + order.createdBy = SecurityUtils.currentUserId() + order.updatedBy = SecurityUtils.currentUserId() + val saved = repository.save(order) + auditService.record("TEST_ORDER_CREATED", "test", saved.id, patientId) + return saved + } +} diff --git a/back001/modules/identity/build.gradle.kts b/back001/modules/identity/build.gradle.kts new file mode 100644 index 0000000..22ead93 --- /dev/null +++ b/back001/modules/identity/build.gradle.kts @@ -0,0 +1,14 @@ +plugins { + kotlin("jvm") + kotlin("plugin.spring") + kotlin("plugin.jpa") + id("io.spring.dependency-management") + id("java-library") +} + +dependencies { + api(project(":common")) + implementation(project(":modules:audit")) + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.springframework.boot:spring-boot-starter-validation") +} diff --git a/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/Patient.kt b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/Patient.kt new file mode 100644 index 0000000..451dee0 --- /dev/null +++ b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/Patient.kt @@ -0,0 +1,18 @@ +package com.mosenioring.identity + +import com.mosenioring.common.BaseEntity +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name = "patients") +class Patient( + @Id + @Column(name = "id") + val id: String, + + @Column(name = "full_name", nullable = false) + val fullName: String +) : BaseEntity() diff --git a/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/PatientCaregiver.kt b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/PatientCaregiver.kt new file mode 100644 index 0000000..4a8c207 --- /dev/null +++ b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/PatientCaregiver.kt @@ -0,0 +1,21 @@ +package com.mosenioring.identity + +import com.mosenioring.common.BaseEntity +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name = "patient_caregivers") +class PatientCaregiver( + @Id + @Column(name = "id") + val id: String, + + @Column(name = "patient_id", nullable = false) + val patientId: String, + + @Column(name = "user_id", nullable = false) + val userId: String +) : BaseEntity() diff --git a/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/PatientDoctor.kt b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/PatientDoctor.kt new file mode 100644 index 0000000..a916eae --- /dev/null +++ b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/PatientDoctor.kt @@ -0,0 +1,21 @@ +package com.mosenioring.identity + +import com.mosenioring.common.BaseEntity +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name = "patient_doctors") +class PatientDoctor( + @Id + @Column(name = "id") + val id: String, + + @Column(name = "patient_id", nullable = false) + val patientId: String, + + @Column(name = "user_id", nullable = false) + val userId: String +) : BaseEntity() diff --git a/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/Tenant.kt b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/Tenant.kt new file mode 100644 index 0000000..a9a1c33 --- /dev/null +++ b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/Tenant.kt @@ -0,0 +1,18 @@ +package com.mosenioring.identity + +import com.mosenioring.common.BaseEntity +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name = "tenants") +class Tenant( + @Id + @Column(name = "id") + val id: String, + + @Column(name = "name", nullable = false) + val name: String +) : BaseEntity() diff --git a/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/User.kt b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/User.kt new file mode 100644 index 0000000..6f19e19 --- /dev/null +++ b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/User.kt @@ -0,0 +1,24 @@ +package com.mosenioring.identity + +import com.mosenioring.common.BaseEntity +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name = "users") +class User( + @Id + @Column(name = "id") + val id: String, + + @Column(name = "email", nullable = false) + val email: String, + + @Column(name = "role", nullable = false) + val role: String, + + @Column(name = "status", nullable = false) + val status: String +) : BaseEntity() diff --git a/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/api/IdentityController.kt b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/api/IdentityController.kt new file mode 100644 index 0000000..994a342 --- /dev/null +++ b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/api/IdentityController.kt @@ -0,0 +1,70 @@ +package com.mosenioring.identity.api + +import com.mosenioring.identity.service.PatientService +import com.mosenioring.identity.service.TenantService +import com.mosenioring.identity.service.UserService +import jakarta.validation.Valid +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.NotBlank +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.* + +@RestController +@RequestMapping("/api/v1") +class IdentityController( + private val tenantService: TenantService, + private val userService: UserService, + private val patientService: PatientService +) { + + @PostMapping("/tenants") + fun createTenant(@Valid @RequestBody request: CreateTenantRequest): ResponseEntity { + val tenant = tenantService.createTenant(request.name) + return ResponseEntity.ok(TenantResponse(tenant.id, tenant.name)) + } + + @PostMapping("/users/invite") + fun inviteUser(@Valid @RequestBody request: InviteUserRequest): ResponseEntity { + val user = userService.inviteUser(request.email, request.role) + return ResponseEntity.ok(UserResponse(user.id, user.email, user.role, user.status)) + } + + @PostMapping("/patients") + fun createPatient(@Valid @RequestBody request: CreatePatientRequest): ResponseEntity { + val patient = patientService.createPatient(request.fullName) + return ResponseEntity.ok(PatientResponse(patient.id, patient.fullName)) + } + + @PostMapping("/patients/{id}/caregivers/{userId}") + fun linkCaregiver(@PathVariable id: String, @PathVariable userId: String): ResponseEntity { + val link = patientService.linkCaregiver(id, userId) + return ResponseEntity.ok(LinkResponse(link.id, link.patientId, link.userId)) + } + + @PostMapping("/patients/{id}/doctors/{userId}") + fun linkDoctor(@PathVariable id: String, @PathVariable userId: String): ResponseEntity { + val link = patientService.linkDoctor(id, userId) + return ResponseEntity.ok(LinkResponse(link.id, link.patientId, link.userId)) + } +} + +data class CreateTenantRequest( + @field:NotBlank val name: String +) + +data class InviteUserRequest( + @field:Email val email: String, + @field:NotBlank val role: String +) + +data class CreatePatientRequest( + @field:NotBlank val fullName: String +) + +data class TenantResponse(val id: String, val name: String) + +data class UserResponse(val id: String, val email: String, val role: String, val status: String) + +data class PatientResponse(val id: String, val fullName: String) + +data class LinkResponse(val id: String, val patientId: String, val userId: String) diff --git a/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/repo/IdentityRepositories.kt b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/repo/IdentityRepositories.kt new file mode 100644 index 0000000..75441a6 --- /dev/null +++ b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/repo/IdentityRepositories.kt @@ -0,0 +1,22 @@ +package com.mosenioring.identity.repo + +import com.mosenioring.identity.* +import org.springframework.data.jpa.repository.JpaRepository + +interface TenantRepository : JpaRepository + +interface UserRepository : JpaRepository { + fun findByIdAndTenantId(id: String, tenantId: String): User? +} + +interface PatientRepository : JpaRepository { + fun findByIdAndTenantId(id: String, tenantId: String): Patient? +} + +interface PatientCaregiverRepository : JpaRepository { + fun existsByTenantIdAndPatientIdAndUserId(tenantId: String, patientId: String, userId: String): Boolean +} + +interface PatientDoctorRepository : JpaRepository { + fun existsByTenantIdAndPatientIdAndUserId(tenantId: String, patientId: String, userId: String): Boolean +} diff --git a/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/repo/PatientRelationshipRepositoryImpl.kt b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/repo/PatientRelationshipRepositoryImpl.kt new file mode 100644 index 0000000..0b8db89 --- /dev/null +++ b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/repo/PatientRelationshipRepositoryImpl.kt @@ -0,0 +1,16 @@ +package com.mosenioring.identity.repo + +import com.mosenioring.common.security.PatientRelationshipRepository +import org.springframework.stereotype.Repository + +@Repository +class PatientRelationshipRepositoryImpl( + private val caregiverRepository: PatientCaregiverRepository, + private val doctorRepository: PatientDoctorRepository +) : PatientRelationshipRepository { + override fun isCaregiverOf(tenantId: String, patientId: String, userId: String): Boolean = + caregiverRepository.existsByTenantIdAndPatientIdAndUserId(tenantId, patientId, userId) + + override fun isDoctorOf(tenantId: String, patientId: String, userId: String): Boolean = + doctorRepository.existsByTenantIdAndPatientIdAndUserId(tenantId, patientId, userId) +} diff --git a/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/service/IdentityServices.kt b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/service/IdentityServices.kt new file mode 100644 index 0000000..b970eac --- /dev/null +++ b/back001/modules/identity/src/main/kotlin/com/mosenioring/identity/service/IdentityServices.kt @@ -0,0 +1,97 @@ +package com.mosenioring.identity.service + +import com.mosenioring.audit.service.AuditService +import com.mosenioring.common.security.SecurityUtils +import com.mosenioring.common.tenant.TenantContext +import com.mosenioring.identity.* +import com.mosenioring.identity.repo.* +import org.springframework.security.access.prepost.PreAuthorize +import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional +import java.util.UUID + +@Service +class TenantService( + private val tenantRepository: TenantRepository, + private val auditService: AuditService +) { + @Transactional + @PreAuthorize("hasRole('ADMIN')") + fun createTenant(name: String): Tenant { + val tenant = Tenant(UUID.randomUUID().toString(), name) + tenant.tenantId = tenant.id + tenant.createdBy = SecurityUtils.currentUserId() + tenant.updatedBy = SecurityUtils.currentUserId() + val saved = tenantRepository.save(tenant) + auditService.record("TENANT_CREATED", "tenant", saved.id, null) + return saved + } +} + +@Service +class UserService( + private val userRepository: UserRepository, + private val auditService: AuditService +) { + @Transactional + @PreAuthorize("hasRole('ADMIN')") + fun inviteUser(email: String, role: String): User { + val tenantId = TenantContext.getTenantId() ?: throw IllegalStateException("Missing tenant") + val user = User(UUID.randomUUID().toString(), email, role, "INVITED") + user.tenantId = tenantId + user.createdBy = SecurityUtils.currentUserId() + user.updatedBy = SecurityUtils.currentUserId() + val saved = userRepository.save(user) + auditService.record("USER_INVITED", "user", saved.id, null) + return saved + } +} + +@Service +class PatientService( + private val patientRepository: PatientRepository, + private val caregiverRepository: PatientCaregiverRepository, + private val doctorRepository: PatientDoctorRepository, + private val auditService: AuditService +) { + @Transactional + @PreAuthorize("hasAnyRole('ADMIN','DOCTOR','CAREGIVER')") + fun createPatient(fullName: String): Patient { + val tenantId = TenantContext.getTenantId() ?: throw IllegalStateException("Missing tenant") + val patient = Patient(UUID.randomUUID().toString(), fullName) + patient.tenantId = tenantId + patient.createdBy = SecurityUtils.currentUserId() + patient.updatedBy = SecurityUtils.currentUserId() + val saved = patientRepository.save(patient) + auditService.record("PATIENT_CREATED", "patient", saved.id, saved.id) + return saved + } + + @Transactional + @PreAuthorize("hasRole('ADMIN')") + fun linkCaregiver(patientId: String, userId: String): PatientCaregiver { + val tenantId = TenantContext.getTenantId() ?: throw IllegalStateException("Missing tenant") + patientRepository.findByIdAndTenantId(patientId, tenantId) ?: throw IllegalArgumentException("Patient not found") + val link = PatientCaregiver(UUID.randomUUID().toString(), patientId, userId) + link.tenantId = tenantId + link.createdBy = SecurityUtils.currentUserId() + link.updatedBy = SecurityUtils.currentUserId() + val saved = caregiverRepository.save(link) + auditService.record("CARE_GIVER_LINKED", "patient_caregiver", saved.id, patientId) + return saved + } + + @Transactional + @PreAuthorize("hasRole('ADMIN')") + fun linkDoctor(patientId: String, userId: String): PatientDoctor { + val tenantId = TenantContext.getTenantId() ?: throw IllegalStateException("Missing tenant") + patientRepository.findByIdAndTenantId(patientId, tenantId) ?: throw IllegalArgumentException("Patient not found") + val link = PatientDoctor(UUID.randomUUID().toString(), patientId, userId) + link.tenantId = tenantId + link.createdBy = SecurityUtils.currentUserId() + link.updatedBy = SecurityUtils.currentUserId() + val saved = doctorRepository.save(link) + auditService.record("DOCTOR_LINKED", "patient_doctor", saved.id, patientId) + return saved + } +} diff --git a/back001/modules/integrations/build.gradle.kts b/back001/modules/integrations/build.gradle.kts new file mode 100644 index 0000000..43c81ef --- /dev/null +++ b/back001/modules/integrations/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + kotlin("jvm") + kotlin("plugin.spring") + kotlin("plugin.jpa") + id("io.spring.dependency-management") + id("java-library") +} + +dependencies { + api(project(":common")) + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("software.amazon.awssdk:s3:2.25.63") +} diff --git a/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/FileMetadata.kt b/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/FileMetadata.kt new file mode 100644 index 0000000..8bf3d78 --- /dev/null +++ b/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/FileMetadata.kt @@ -0,0 +1,27 @@ +package com.mosenioring.integrations + +import com.mosenioring.common.BaseEntity +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name = "files") +class FileMetadata( + @Id + @Column(name = "id") + val id: String, + + @Column(name = "patient_id") + val patientId: String?, + + @Column(name = "file_name", nullable = false) + val fileName: String, + + @Column(name = "content_type", nullable = false) + val contentType: String, + + @Column(name = "storage_key", nullable = false) + val storageKey: String +) : BaseEntity() diff --git a/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/api/FilesController.kt b/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/api/FilesController.kt new file mode 100644 index 0000000..4792d95 --- /dev/null +++ b/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/api/FilesController.kt @@ -0,0 +1,32 @@ +package com.mosenioring.integrations.api + +import com.mosenioring.integrations.service.FileService +import com.mosenioring.integrations.service.PresignResponse +import jakarta.validation.Valid +import jakarta.validation.constraints.NotBlank +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.* + +@RestController +@RequestMapping("/api/v1") +class FilesController( + private val fileService: FileService +) { + @PostMapping("/files/presign-upload") + fun presignUpload(@Valid @RequestBody request: PresignUploadRequest): ResponseEntity { + val response = fileService.presignUpload(request.fileName, request.contentType, request.patientId) + return ResponseEntity.ok(response) + } + + @GetMapping("/files/{fileId}/presign-download") + fun presignDownload(@PathVariable fileId: String): ResponseEntity { + val response = fileService.presignDownload(fileId) + return ResponseEntity.ok(response) + } +} + +data class PresignUploadRequest( + @field:NotBlank val fileName: String, + @field:NotBlank val contentType: String, + val patientId: String? +) diff --git a/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/repo/FileRepository.kt b/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/repo/FileRepository.kt new file mode 100644 index 0000000..0940f99 --- /dev/null +++ b/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/repo/FileRepository.kt @@ -0,0 +1,8 @@ +package com.mosenioring.integrations.repo + +import com.mosenioring.integrations.FileMetadata +import org.springframework.data.jpa.repository.JpaRepository + +interface FileRepository : JpaRepository { + fun findByIdAndTenantId(id: String, tenantId: String): FileMetadata? +} diff --git a/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/service/FhirGateway.kt b/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/service/FhirGateway.kt new file mode 100644 index 0000000..c1d97cb --- /dev/null +++ b/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/service/FhirGateway.kt @@ -0,0 +1,10 @@ +package com.mosenioring.integrations.service + +import org.springframework.stereotype.Service + +@Service +class FhirGateway { + fun submitObservation(payload: String): String { + return "stub-${payload.hashCode()}" + } +} diff --git a/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/service/FileService.kt b/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/service/FileService.kt new file mode 100644 index 0000000..daf5138 --- /dev/null +++ b/back001/modules/integrations/src/main/kotlin/com/mosenioring/integrations/service/FileService.kt @@ -0,0 +1,90 @@ +package com.mosenioring.integrations.service + +import com.mosenioring.common.security.SecurityUtils +import com.mosenioring.common.tenant.TenantContext +import com.mosenioring.integrations.FileMetadata +import com.mosenioring.integrations.repo.FileRepository +import org.springframework.beans.factory.annotation.Value +import org.springframework.stereotype.Service +import software.amazon.awssdk.auth.credentials.AwsBasicCredentials +import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider +import software.amazon.awssdk.regions.Region +import software.amazon.awssdk.services.s3.S3Configuration +import software.amazon.awssdk.services.s3.presigner.S3Presigner +import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest +import software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest +import software.amazon.awssdk.services.s3.model.GetObjectRequest +import software.amazon.awssdk.services.s3.model.PutObjectRequest +import java.net.URI +import java.time.Duration +import java.util.UUID + +@Service +class FileService( + private val repository: FileRepository, + @Value("\${storage.s3.endpoint}") private val endpoint: String, + @Value("\${storage.s3.region}") private val region: String, + @Value("\${storage.s3.access-key}") private val accessKey: String, + @Value("\${storage.s3.secret-key}") private val secretKey: String, + @Value("\${storage.s3.bucket}") private val bucket: String +) { + private fun presigner(): S3Presigner { + val creds = AwsBasicCredentials.create(accessKey, secretKey) + return S3Presigner.builder() + .endpointOverride(URI.create(endpoint)) + .region(Region.of(region)) + .credentialsProvider(StaticCredentialsProvider.create(creds)) + .serviceConfiguration(S3Configuration.builder().pathStyleAccessEnabled(true).build()) + .build() + } + + fun presignUpload(fileName: String, contentType: String, patientId: String?): PresignResponse { + val tenantId = TenantContext.getTenantId() ?: throw IllegalStateException("Missing tenant") + val fileId = UUID.randomUUID().toString() + val storageKey = "$tenantId/$fileId/$fileName" + val metadata = FileMetadata(fileId, patientId, fileName, contentType, storageKey) + metadata.tenantId = tenantId + metadata.createdBy = SecurityUtils.currentUserId() + metadata.updatedBy = SecurityUtils.currentUserId() + repository.save(metadata) + + val presigner = presigner() + try { + val request = PutObjectRequest.builder() + .bucket(bucket) + .key(storageKey) + .contentType(contentType) + .build() + val presignRequest = PutObjectPresignRequest.builder() + .signatureDuration(Duration.ofMinutes(15)) + .putObjectRequest(request) + .build() + val presigned = presigner.presignPutObject(presignRequest) + return PresignResponse(fileId, presigned.url().toString()) + } finally { + presigner.close() + } + } + + fun presignDownload(fileId: String): PresignResponse { + val tenantId = TenantContext.getTenantId() ?: throw IllegalStateException("Missing tenant") + val metadata = repository.findByIdAndTenantId(fileId, tenantId) ?: throw IllegalArgumentException("File not found") + val presigner = presigner() + try { + val request = GetObjectRequest.builder() + .bucket(bucket) + .key(metadata.storageKey) + .build() + val presignRequest = GetObjectPresignRequest.builder() + .signatureDuration(Duration.ofMinutes(15)) + .getObjectRequest(request) + .build() + val presigned = presigner.presignGetObject(presignRequest) + return PresignResponse(metadata.id, presigned.url().toString()) + } finally { + presigner.close() + } + } +} + +data class PresignResponse(val fileId: String, val url: String) diff --git a/back001/modules/messaging/build.gradle.kts b/back001/modules/messaging/build.gradle.kts new file mode 100644 index 0000000..22ead93 --- /dev/null +++ b/back001/modules/messaging/build.gradle.kts @@ -0,0 +1,14 @@ +plugins { + kotlin("jvm") + kotlin("plugin.spring") + kotlin("plugin.jpa") + id("io.spring.dependency-management") + id("java-library") +} + +dependencies { + api(project(":common")) + implementation(project(":modules:audit")) + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.springframework.boot:spring-boot-starter-validation") +} diff --git a/back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/Message.kt b/back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/Message.kt new file mode 100644 index 0000000..a603fe9 --- /dev/null +++ b/back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/Message.kt @@ -0,0 +1,24 @@ +package com.mosenioring.messaging + +import com.mosenioring.common.BaseEntity +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name = "messages") +class Message( + @Id + @Column(name = "id") + val id: String, + + @Column(name = "patient_id", nullable = false) + val patientId: String, + + @Column(name = "sender_id", nullable = false) + val senderId: String, + + @Column(name = "body", nullable = false) + val body: String +) : BaseEntity() diff --git a/back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/api/MessagingController.kt b/back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/api/MessagingController.kt new file mode 100644 index 0000000..66e2e6d --- /dev/null +++ b/back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/api/MessagingController.kt @@ -0,0 +1,28 @@ +package com.mosenioring.messaging.api + +import com.mosenioring.messaging.service.MessageService +import jakarta.validation.Valid +import jakarta.validation.constraints.NotBlank +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.* + +@RestController +@RequestMapping("/api/v1") +class MessagingController( + private val messageService: MessageService +) { + @PostMapping("/patients/{id}/messages") + fun addMessage( + @PathVariable id: String, + @Valid @RequestBody request: AddMessageRequest + ): ResponseEntity { + val message = messageService.addMessage(id, request.body) + return ResponseEntity.ok(MessageResponse(message.id, message.patientId, message.senderId, message.body)) + } +} + +data class AddMessageRequest( + @field:NotBlank val body: String +) + +data class MessageResponse(val id: String, val patientId: String, val senderId: String, val body: String) diff --git a/back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/repo/MessageRepository.kt b/back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/repo/MessageRepository.kt new file mode 100644 index 0000000..91a3d2c --- /dev/null +++ b/back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/repo/MessageRepository.kt @@ -0,0 +1,6 @@ +package com.mosenioring.messaging.repo + +import com.mosenioring.messaging.Message +import org.springframework.data.jpa.repository.JpaRepository + +interface MessageRepository : JpaRepository diff --git a/back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/service/MessageService.kt b/back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/service/MessageService.kt new file mode 100644 index 0000000..92bdb12 --- /dev/null +++ b/back001/modules/messaging/src/main/kotlin/com/mosenioring/messaging/service/MessageService.kt @@ -0,0 +1,31 @@ +package com.mosenioring.messaging.service + +import com.mosenioring.audit.service.AuditService +import com.mosenioring.common.security.PatientAccess +import com.mosenioring.common.security.SecurityUtils +import com.mosenioring.common.tenant.TenantContext +import com.mosenioring.messaging.Message +import com.mosenioring.messaging.repo.MessageRepository +import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional +import java.util.UUID + +@Service +class MessageService( + private val repository: MessageRepository, + private val auditService: AuditService +) { + @Transactional + @PatientAccess + fun addMessage(patientId: String, body: String): Message { + val tenantId = TenantContext.getTenantId() ?: throw IllegalStateException("Missing tenant") + val senderId = SecurityUtils.currentUserId() ?: throw IllegalStateException("Missing user") + val message = Message(UUID.randomUUID().toString(), patientId, senderId, body) + message.tenantId = tenantId + message.createdBy = senderId + message.updatedBy = senderId + val saved = repository.save(message) + auditService.record("MESSAGE_ADDED", "message", saved.id, patientId) + return saved + } +} diff --git a/back001/modules/notifications/build.gradle.kts b/back001/modules/notifications/build.gradle.kts new file mode 100644 index 0000000..688b5f1 --- /dev/null +++ b/back001/modules/notifications/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + kotlin("jvm") + kotlin("plugin.spring") + kotlin("plugin.jpa") + id("io.spring.dependency-management") + id("java-library") +} + +dependencies { + api(project(":common")) + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.springframework.boot:spring-boot-starter-amqp") +} diff --git a/back001/modules/notifications/src/main/kotlin/com/mosenioring/notifications/api/NotificationsController.kt b/back001/modules/notifications/src/main/kotlin/com/mosenioring/notifications/api/NotificationsController.kt new file mode 100644 index 0000000..e0a9694 --- /dev/null +++ b/back001/modules/notifications/src/main/kotlin/com/mosenioring/notifications/api/NotificationsController.kt @@ -0,0 +1,25 @@ +package com.mosenioring.notifications.api + +import com.mosenioring.notifications.service.NotificationService +import jakarta.validation.Valid +import jakarta.validation.constraints.NotBlank +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.* + +@RestController +@RequestMapping("/api/v1") +class NotificationsController( + private val notificationService: NotificationService +) { + @PostMapping("/notifications/test") + fun enqueueTest(@Valid @RequestBody request: NotificationRequest): ResponseEntity { + val eventId = notificationService.enqueueTestNotification(request.message) + return ResponseEntity.ok(NotificationResponse(eventId)) + } +} + +data class NotificationRequest( + @field:NotBlank val message: String +) + +data class NotificationResponse(val eventId: String) diff --git a/back001/modules/notifications/src/main/kotlin/com/mosenioring/notifications/service/NotificationService.kt b/back001/modules/notifications/src/main/kotlin/com/mosenioring/notifications/service/NotificationService.kt new file mode 100644 index 0000000..ee1463a --- /dev/null +++ b/back001/modules/notifications/src/main/kotlin/com/mosenioring/notifications/service/NotificationService.kt @@ -0,0 +1,30 @@ +package com.mosenioring.notifications.service + +import com.mosenioring.common.Events +import com.mosenioring.common.outbox.OutboxService +import com.mosenioring.common.security.SecurityUtils +import com.mosenioring.common.tenant.TenantContext +import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional +import java.util.UUID + +@Service +class NotificationService( + private val outboxService: OutboxService +) { + @Transactional + fun enqueueTestNotification(message: String): String { + val tenantId = TenantContext.getTenantId() ?: throw IllegalStateException("Missing tenant") + val eventId = UUID.randomUUID().toString() + outboxService.enqueue( + Events.NOTIFICATION_REQUESTED, + mapOf( + "eventId" to eventId, + "tenantId" to tenantId, + "message" to message, + "requestedBy" to (SecurityUtils.currentUserId() ?: "unknown") + ) + ) + return eventId + } +} diff --git a/back001/requests.http b/back001/requests.http new file mode 100644 index 0000000..5c2d6e6 --- /dev/null +++ b/back001/requests.http @@ -0,0 +1,55 @@ +### Local tenant setup (use local profile + headers) +POST http://localhost:8080/api/v1/tenants +X-Local-User: admin +X-Local-Tenant: tenant-demo +X-Local-Roles: ADMIN +Content-Type: application/json + +{ + "name": "Demo Tenant" +} + +### Invite user +POST http://localhost:8080/api/v1/users/invite +X-Local-User: admin +X-Local-Tenant: tenant-demo +X-Local-Roles: ADMIN +Content-Type: application/json + +{ + "email": "doc@example.com", + "role": "DOCTOR" +} + +### Create patient +POST http://localhost:8080/api/v1/patients +X-Local-User: admin +X-Local-Tenant: tenant-demo +X-Local-Roles: ADMIN +Content-Type: application/json + +{ + "fullName": "Jane Doe" +} + +### Create medication plan +POST http://localhost:8080/api/v1/patients/{patientId}/medications +X-Local-User: admin +X-Local-Tenant: tenant-demo +X-Local-Roles: ADMIN +Content-Type: application/json + +{ + "description": "Take 5mg daily" +} + +### Test notification +POST http://localhost:8080/api/v1/notifications/test +X-Local-User: admin +X-Local-Tenant: tenant-demo +X-Local-Roles: ADMIN +Content-Type: application/json + +{ + "message": "Test notification" +} diff --git a/back001/settings.gradle.kts b/back001/settings.gradle.kts new file mode 100644 index 0000000..d9a5e9c --- /dev/null +++ b/back001/settings.gradle.kts @@ -0,0 +1,13 @@ +rootProject.name = "mosenioring-backend" + +include( + ":app", + ":common", + ":modules:identity", + ":modules:clinical", + ":modules:messaging", + ":modules:notifications", + ":modules:audit", + ":modules:integrations", + ":workers:notification-worker" +) diff --git a/back001/workers/notification-worker/build.gradle.kts b/back001/workers/notification-worker/build.gradle.kts new file mode 100644 index 0000000..d893875 --- /dev/null +++ b/back001/workers/notification-worker/build.gradle.kts @@ -0,0 +1,16 @@ +plugins { + kotlin("jvm") + kotlin("plugin.spring") + id("org.springframework.boot") + id("io.spring.dependency-management") +} + +dependencies { + implementation(project(":common")) + implementation("org.springframework.boot:spring-boot-starter-amqp") + implementation("org.springframework.boot:spring-boot-starter-data-redis") + implementation("org.springframework.boot:spring-boot-starter-actuator") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + + testImplementation("org.springframework.boot:spring-boot-starter-test") +} diff --git a/back001/workers/notification-worker/src/main/kotlin/com/mosenioring/worker/NotificationListener.kt b/back001/workers/notification-worker/src/main/kotlin/com/mosenioring/worker/NotificationListener.kt new file mode 100644 index 0000000..68fa89b --- /dev/null +++ b/back001/workers/notification-worker/src/main/kotlin/com/mosenioring/worker/NotificationListener.kt @@ -0,0 +1,41 @@ +package com.mosenioring.worker + +import com.fasterxml.jackson.databind.ObjectMapper +import com.mosenioring.common.Events +import org.slf4j.LoggerFactory +import org.springframework.amqp.rabbit.annotation.RabbitListener +import org.springframework.amqp.rabbit.core.RabbitTemplate +import org.springframework.beans.factory.annotation.Value +import org.springframework.data.redis.core.StringRedisTemplate +import org.springframework.stereotype.Component +import java.time.Duration + +@Component +class NotificationListener( + private val redisTemplate: StringRedisTemplate, + private val rabbitTemplate: RabbitTemplate, + private val objectMapper: ObjectMapper, + @Value("\${app.idempotency.ttl-seconds:3600}") private val ttlSeconds: Long +) { + private val logger = LoggerFactory.getLogger(javaClass) + + @RabbitListener(queues = [Events.MEDICATION_QUEUE]) + fun onMedicationPlanCreated(payload: String) { + val node = objectMapper.readTree(payload) + val eventId = node["eventId"]?.asText() ?: return + val idempotencyKey = "medication:$eventId" + val acquired = redisTemplate.opsForValue().setIfAbsent(idempotencyKey, "1", Duration.ofSeconds(ttlSeconds)) + if (acquired != true) { + logger.info("Duplicate event ignored: {}", eventId) + return + } + val notificationPayload = mapOf( + "eventId" to eventId, + "tenantId" to node["tenantId"]?.asText(), + "patientId" to node["patientId"]?.asText(), + "message" to "Medication plan created" + ) + rabbitTemplate.convertAndSend(Events.NOTIFICATION_EXCHANGE, Events.NOTIFICATION_REQUESTED, objectMapper.writeValueAsString(notificationPayload)) + logger.info("Notification requested for medication plan event {}", eventId) + } +} diff --git a/back001/workers/notification-worker/src/main/kotlin/com/mosenioring/worker/NotificationWorkerApplication.kt b/back001/workers/notification-worker/src/main/kotlin/com/mosenioring/worker/NotificationWorkerApplication.kt new file mode 100644 index 0000000..581ff48 --- /dev/null +++ b/back001/workers/notification-worker/src/main/kotlin/com/mosenioring/worker/NotificationWorkerApplication.kt @@ -0,0 +1,11 @@ +package com.mosenioring.worker + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication + +@SpringBootApplication(scanBasePackages = ["com.mosenioring"]) +class NotificationWorkerApplication + +fun main(args: Array) { + runApplication(*args) +} diff --git a/back001/workers/notification-worker/src/main/kotlin/com/mosenioring/worker/WorkerMessagingConfig.kt b/back001/workers/notification-worker/src/main/kotlin/com/mosenioring/worker/WorkerMessagingConfig.kt new file mode 100644 index 0000000..df789be --- /dev/null +++ b/back001/workers/notification-worker/src/main/kotlin/com/mosenioring/worker/WorkerMessagingConfig.kt @@ -0,0 +1,23 @@ +package com.mosenioring.worker + +import com.mosenioring.common.Events +import org.springframework.amqp.core.Binding +import org.springframework.amqp.core.BindingBuilder +import org.springframework.amqp.core.DirectExchange +import org.springframework.amqp.core.Queue +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration + +@Configuration +class WorkerMessagingConfig { + + @Bean + fun medicationExchange(): DirectExchange = DirectExchange(Events.MEDICATION_EXCHANGE) + + @Bean + fun medicationQueue(): Queue = Queue(Events.MEDICATION_QUEUE, true) + + @Bean + fun medicationBinding(medicationExchange: DirectExchange, medicationQueue: Queue): Binding = + BindingBuilder.bind(medicationQueue).to(medicationExchange).with(Events.MEDICATION_PLAN_CREATED) +} diff --git a/back001/workers/notification-worker/src/main/resources/application.yml b/back001/workers/notification-worker/src/main/resources/application.yml new file mode 100644 index 0000000..0f788a4 --- /dev/null +++ b/back001/workers/notification-worker/src/main/resources/application.yml @@ -0,0 +1,30 @@ +spring: + application: + name: notification-worker + profiles: + active: worker + main: + web-application-type: none + autoconfigure: + exclude: + - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration + - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration + rabbitmq: + host: localhost + port: 5672 + username: guest + password: guest + data: + redis: + host: localhost + port: 6379 + +app: + idempotency: + ttl-seconds: 3600 + +management: + endpoints: + web: + exposure: + include: health,info,prometheus