andwati/telecom-platform
1
0
Fork 0
mirror of https://github.com/andwati/telecom-platform.git synced 2026-10-18 11:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Extract router configuration from api module into dedicated routes module

Browse Source 
- Move create_router function from api.rs to new routes.rs module
- Move routing imports (delete/get/post/put/Router/CorsLayer) from api to routes
- Add handler function imports to routes module
- Move AppState from api to models module
- Remove validation comments from check_credit/deduct_credit/add_credit/get_balance/record_usage handlers
- Add IntoResponse import to api module
This commit is contained in:
nutcas3
2026-04-25 01:59:40 +03:00
parent 67a2c807d1
commit 99943c769e
2 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/charging-engine/src/api.rs
+3 -43
View File
@@ -1,12 +1,11 @@
use axum::{
extract::{Path, State},
routing::{delete, get, post, put},
Json, Router,
response::IntoResponse,
Json,
};
use tower_http::cors::{Any, CorsLayer};
use tracing::info;
use crate::errors::{ChargingError, ChargingResult, validate_ip, validate_bytes, ErrorContext, log_error, validate_amount, validate_session_id};
use crate::errors::{ChargingError, ChargingResult, ErrorContext, log_error, validate_ip, validate_bytes, validate_amount, validate_session_id};
use crate::models::*;
#[derive(Clone)]
@@ -14,40 +13,6 @@ pub struct AppState {
pub charging_engine: std::sync::Arc<crate::charging::ChargingEngine>,
}
pub fn create_router(state: AppState) -> Router {
let cors = CorsLayer::new()
.allow_origin(Any)
.allow_methods(Any)
.allow_headers(Any);
Router::new()
.route("/v1/credit/:ip/check", post(check_credit))
.route("/v1/credit/:ip/deduct", post(deduct_credit))
.route("/v1/credit/:ip/add", post(add_credit))
.route("/v1/credit/:ip/balance", get(get_balance))
.route("/v1/subscriber/:imsi", get(get_subscriber))
.route("/v1/subscriber/:imsi", put(update_subscriber))
.route("/v1/usage", post(record_usage))
.route("/v1/rating-plans", get(list_rating_plans))
.route("/v1/rating-plans/:id", get(get_rating_plan))
.route("/v1/rating-plans", post(add_rating_plan))
.route("/v1/rating-plans/:id", delete(remove_rating_plan))
.route("/v1/block/:ip", post(block_user))
.route("/v1/unblock/:ip", post(unblock_user))
.route("/v1/blocked/:ip", get(is_user_blocked))
.route("/v1/stats", get(get_system_stats))
.route("/v1/metrics", get(get_performance_metrics))
.route("/v1/errors", get(get_error_stats))
.route("/v1/sync/start", post(start_sync))
.route("/v1/health/detailed", get(detailed_health_check))
.route("/v1/engine/start", post(engine_start))
.route("/v1/engine/stop", post(engine_stop))
.route("/v1/engine/uptime", get(engine_uptime))
.route("/health", get(health_check))
.layer(cors)
.with_state(state)
}
/// POST /v1/credit/:ip/check
/// Check if user has enough credit for data usage
pub async fn check_credit(
@@ -55,7 +20,6 @@ pub async fn check_credit(
State(state): State<AppState>,
Json(req): Json<CreditCheckRequest>,
) -> ChargingResult<Json<CreditCheckResponse>> {
// Validate input
validate_ip(&ip)?;
validate_bytes(req.bytes_requested)?;
@@ -87,7 +51,6 @@ pub async fn deduct_credit(
State(state): State<AppState>,
Json(req): Json<DeductRequest>,
) -> ChargingResult<()> {
// Validate input
validate_ip(&ip)?;
validate_bytes(req.bytes_used)?;
validate_amount(req.bytes_used as f64)?;
@@ -110,7 +73,6 @@ pub async fn add_credit(
State(state): State<AppState>,
Json(req): Json<AddCreditRequest>,
) -> ChargingResult<()> {
// Validate input
validate_ip(&ip)?;
validate_bytes(req.bytes_to_add)?;
validate_amount(req.bytes_to_add as f64)?;
@@ -132,7 +94,6 @@ pub async fn get_balance(
Path(ip): Path<String>,
State(state): State<AppState>,
) -> ChargingResult<Json<BalanceResponse>> {
// Validate input
validate_ip(&ip)?;
let balance = state.charging_engine.get_balance(&ip).await
@@ -185,7 +146,6 @@ pub async fn record_usage(
validate_session_id(session_id)?;
// Create and record usage event
let event = crate::charging::types::UsageEvent {
imsi: imsi.to_string(),
session_id: session_id.to_string(),
apps/charging-engine/src/routes.rs
+50
View File
@@ -0,0 +1,50 @@
use axum::{
extract::{Path, State},
response::IntoResponse,
routing::{delete, get, post, put},
Json, Router,
};
use tower_http::cors::{Any, CorsLayer};
use tracing::info;
use crate::api::{
add_credit, add_rating_plan, block_user, check_credit, deduct_credit, detailed_health_check,
engine_start, engine_stop, engine_uptime, get_balance, get_error_stats, get_performance_metrics,
get_rating_plan, get_subscriber, get_system_stats, is_user_blocked, list_rating_plans,
record_usage, remove_rating_plan, start_sync, unblock_user, update_subscriber, health_check,
};
use crate::models::AppState;
pub fn create_router(state: AppState) -> Router {
let cors = CorsLayer::new()
.allow_origin(Any)
.allow_methods(Any)
.allow_headers(Any);
Router::new()
.route("/v1/credit/:ip/check", post(check_credit))
.route("/v1/credit/:ip/deduct", post(deduct_credit))
.route("/v1/credit/:ip/add", post(add_credit))
.route("/v1/credit/:ip/balance", get(get_balance))
.route("/v1/subscriber/:imsi", get(get_subscriber))
.route("/v1/subscriber/:imsi", put(update_subscriber))
.route("/v1/usage", post(record_usage))
.route("/v1/rating-plans", get(list_rating_plans))
.route("/v1/rating-plans/:id", get(get_rating_plan))
.route("/v1/rating-plans", post(add_rating_plan))
.route("/v1/rating-plans/:id", delete(remove_rating_plan))
.route("/v1/block/:ip", post(block_user))
.route("/v1/unblock/:ip", post(unblock_user))
.route("/v1/blocked/:ip", get(is_user_blocked))
.route("/v1/stats", get(get_system_stats))
.route("/v1/metrics", get(get_performance_metrics))
.route("/v1/errors", get(get_error_stats))
.route("/v1/sync/start", post(start_sync))
.route("/v1/health/detailed", get(detailed_health_check))
.route("/v1/engine/start", post(engine_start))
.route("/v1/engine/stop", post(engine_stop))
.route("/v1/engine/uptime", get(engine_uptime))
.route("/health", get(health_check))
.layer(cors)
.with_state(state)
}