From a32f1522f94a235df8e7ea80fcaea424402b7540 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Sat, 9 Mar 2024 11:24:09 +0100 Subject: [PATCH] feat: do not use episode id in kafka record key Closes #1 --- src/auth.rs | 2 +- src/main.rs | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/auth.rs b/src/auth.rs index 6a254db..b63a9de 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -1,5 +1,5 @@ -use base64::Engine; use base64::prelude::BASE64_STANDARD; +use base64::Engine; pub fn check_basic_auth(auth_header: &str, expected_token: &str) -> bool { let split = auth_header.split(' ').collect::>(); diff --git a/src/main.rs b/src/main.rs index 1af0faa..7769a25 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,18 +1,18 @@ use std::env; use std::time::Duration; -use axum::{Extension, Json, Router}; use axum::body::Body; use axum::extract::Path; -use axum::http::{Request, StatusCode}; use axum::http::header::AUTHORIZATION; +use axum::http::{Request, StatusCode}; use axum::middleware::{from_fn, Next}; use axum::response::Response; use axum::routing::{delete, post}; +use axum::{Extension, Json, Router}; use bwhc_dto::MtbFile; -use rdkafka::ClientConfig; use rdkafka::message::{Header, OwnedHeaders}; use rdkafka::producer::{FutureProducer, FutureRecord}; +use rdkafka::ClientConfig; use serde::{Deserialize, Serialize}; #[cfg(debug_assertions)] use tower_http::trace::TraceLayer; @@ -24,8 +24,6 @@ mod auth; struct RecordKey { #[serde(rename = "pid")] patient_id: String, - #[serde(rename = "eid", skip_serializing_if = "Option::is_none")] - episode_id: Option, } #[tokio::main] @@ -103,11 +101,6 @@ async fn send_mtb_file( let record_key = RecordKey { patient_id: mtb_file.patient.id.to_string(), - episode_id: if mtb_file.episode.id.is_empty() { - None - } else { - Some(mtb_file.episode.id.to_string()) - }, }; let record_headers = OwnedHeaders::default().insert(Header {