Rewrite from mongodb to sqlx #1
@@ -1,2 +1 @@
|
||||
MONGODB_URI=mongodb://localhost:27017
|
||||
DB_NAME=rick_and_morty
|
||||
DATABASE_URL="sqlite:rick_and_morty.db"
|
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,2 +1,3 @@
|
||||
/target
|
||||
.env
|
||||
.env
|
||||
*.db
|
1388
Cargo.lock
generated
1388
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
19
Cargo.toml
19
Cargo.toml
@@ -7,16 +7,27 @@ edition = "2024"
|
||||
anyhow = "1.0.98"
|
||||
axum = { version = "0.8.4", features = ["macros"] }
|
||||
dotenvy = "0.15.7"
|
||||
futures-util = "0.3.31"
|
||||
http = "1.3.1"
|
||||
mongodb = "3.2.4"
|
||||
once_cell = "1.21.3"
|
||||
reqwest = { version = "0.12.22", features = ["json"] }
|
||||
serde = { version = "1.0.219", features = ["derive"] }
|
||||
serde_json = "1.0.140"
|
||||
tokio = { version = "1.46.1", features = [] }
|
||||
sqlx = { version = "0.8.6", features = [
|
||||
"sqlite",
|
||||
"runtime-tokio",
|
||||
"tls-native-tls",
|
||||
"macros",
|
||||
"uuid",
|
||||
] }
|
||||
tokio = { version = "1.46.1", features = ["full"] }
|
||||
tower = { version = "0.5.2", features = ["util"] }
|
||||
tower-http = { version = "0.6.6", features = ["cors", "fs", "trace"] }
|
||||
tracing = "0.1.41"
|
||||
tracing-log = "0.2.0"
|
||||
tracing-subscriber = { version = "0.3.19", features = ["env-filter", "fmt"] }
|
||||
|
||||
[profile.release]
|
||||
opt-level = 3
|
||||
lto = true
|
||||
codegen-units = 1
|
||||
panic = "abort"
|
||||
strip = true
|
||||
|
10
Dockerfile
10
Dockerfile
@@ -10,15 +10,21 @@ WORKDIR /app
|
||||
RUN apt-get update && \
|
||||
apt-get install -y pkg-config libssl-dev build-essential ca-certificates
|
||||
|
||||
COPY migrations/ migrations/
|
||||
COPY src/ src/
|
||||
COPY Cargo.toml Cargo.lock ./
|
||||
RUN cargo build --release
|
||||
|
||||
FROM debian:bookworm-slim
|
||||
WORKDIR /app
|
||||
RUN apt-get update && apt-get install -y ca-certificates openssl && rm -rf /var/lib/apt/lists/*
|
||||
RUN apt-get update && apt-get install -y ca-certificates openssl sqlite3 && rm -rf /var/lib/apt/lists/*
|
||||
RUN mkdir -p /app/data
|
||||
COPY --from=backend-builder /app/target/release/rick-and-morty .
|
||||
COPY --from=backend-builder /app/target/release/fetch_characters .
|
||||
COPY --from=backend-builder /app/migrations ./migrations
|
||||
COPY --from=frontend-builder /app/dist ./frontend/dist
|
||||
EXPOSE 8000
|
||||
|
||||
CMD ["./rick-and-morty"]
|
||||
COPY entrypoint.sh /app/
|
||||
RUN chmod +x /app/entrypoint.sh
|
||||
ENTRYPOINT ["/app/entrypoint.sh"]
|
19
compose.yml
19
compose.yml
@@ -1,26 +1,15 @@
|
||||
services:
|
||||
mongo:
|
||||
image: mongo:6.0
|
||||
container_name: rick_and_morty_mongo
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "27017:27017"
|
||||
environment:
|
||||
MONGO_INITDB_DATABASE: rick_and_morty
|
||||
volumes:
|
||||
- mongo-data:/data/db
|
||||
app:
|
||||
build: .
|
||||
container_name: rick_and_morty_app
|
||||
depends_on:
|
||||
- mongo
|
||||
environment:
|
||||
MONGODB_URI: mongodb://mongo:27017
|
||||
DB_NAME: rick_and_morty
|
||||
DATABASE_URL: "sqlite:///app/data/rick_and_morty.db?mode=rwc"
|
||||
BIND_ADDR: 0.0.0.0:8000
|
||||
ports:
|
||||
- "8000:8000"
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- rick_and_morty_data:/app/data
|
||||
|
||||
volumes:
|
||||
mongo-data:
|
||||
rick_and_morty_data:
|
||||
|
3
entrypoint.sh
Normal file
3
entrypoint.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
chown -R $(id -u):$(id -g) /app/data
|
||||
exec ./rick-and-morty
|
Binary file not shown.
@@ -4,21 +4,22 @@ import { getCharacters, rateCharacters } from "./api";
|
||||
import type { Character } from "./types";
|
||||
import { Card } from "./components/card";
|
||||
import { Table } from "./components/table";
|
||||
import { getId } from "./utils";
|
||||
|
||||
function getRandomIndex(length: number) {
|
||||
return Math.floor(Math.random() * length);
|
||||
}
|
||||
|
||||
function getRandomPair(characters: Character[], lastPair: [number, number]) {
|
||||
if (characters.length < 2) return [null, null];
|
||||
|
||||
// Optionally: Use a lastPairRef to avoid same characters twice in a row
|
||||
function getRandomPair(
|
||||
characters: Character[],
|
||||
lastPair: [number, number] | null
|
||||
): [Character, Character] {
|
||||
if (characters.length < 2) return [null, null] as never;
|
||||
let firstIndex = getRandomIndex(characters.length);
|
||||
let secondIndex = getRandomIndex(characters.length);
|
||||
|
||||
while (
|
||||
firstIndex === lastPair[0] ||
|
||||
secondIndex === lastPair[1] ||
|
||||
(lastPair && firstIndex === lastPair[0] && secondIndex === lastPair[1]) ||
|
||||
firstIndex === secondIndex
|
||||
) {
|
||||
firstIndex = getRandomIndex(characters.length);
|
||||
@@ -57,8 +58,8 @@ const App: React.FC = () => {
|
||||
if (voting || !rivals[winnerIdx] || !rivals[loserIdx]) return;
|
||||
setVoting(true);
|
||||
setVotedLeft(winnerIdx === 0);
|
||||
const winnerId = getId(rivals[winnerIdx]);
|
||||
const loserId = getId(rivals[loserIdx]);
|
||||
const winnerId = rivals[winnerIdx]!.id;
|
||||
const loserId = rivals[loserIdx]!.id;
|
||||
if (!winnerId || !loserId) return;
|
||||
await rateCharacters(winnerId, loserId);
|
||||
const chars = await getCharacters();
|
||||
|
@@ -2,13 +2,19 @@ import type { Character } from './types';
|
||||
|
||||
export const getCharacters = async (): Promise<Character[]> => {
|
||||
const res = await fetch('/characters');
|
||||
if (!res.ok) {
|
||||
throw new Error('Failed to fetch characters');
|
||||
}
|
||||
return res.json();
|
||||
};
|
||||
|
||||
export const rateCharacters = async (winnerId: string, loserId: string) => {
|
||||
await fetch('/rate', {
|
||||
export const rateCharacters = async (winnerId: number, loserId: number) => {
|
||||
const res = await fetch('/rate', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ winner_id: winnerId, loser_id: loserId }),
|
||||
body: JSON.stringify({ winner_id: winnerId.toString(), loser_id: loserId.toString() }),
|
||||
});
|
||||
if (!res.ok) {
|
||||
throw new Error('Failed to rate characters');
|
||||
}
|
||||
};
|
||||
|
@@ -1,62 +1,64 @@
|
||||
import React from 'react';
|
||||
import type { Character } from '../types';
|
||||
import React from "react";
|
||||
import type { Character } from "../types";
|
||||
|
||||
interface CardProps {
|
||||
data: Character;
|
||||
isClicked?: boolean;
|
||||
skipped?: boolean;
|
||||
onClick?: () => void;
|
||||
isRight?: boolean;
|
||||
data: Character;
|
||||
isClicked?: boolean;
|
||||
skipped?: boolean;
|
||||
onClick?: () => void;
|
||||
isRight?: boolean;
|
||||
}
|
||||
|
||||
export const Card: React.FC<CardProps> = ({
|
||||
data,
|
||||
isClicked,
|
||||
skipped,
|
||||
onClick,
|
||||
data,
|
||||
isClicked,
|
||||
skipped,
|
||||
onClick,
|
||||
}) => (
|
||||
<div
|
||||
className={`card bg-gray-300 flex flex-col items-center shadow-lg rounded p-1 transform transition ease-in-out ${isClicked || skipped ? 'flip-card' : ''} md:hover:scale-105`}
|
||||
onClick={onClick}
|
||||
style={{ cursor: 'pointer' }}
|
||||
>
|
||||
<div className="card-inner">
|
||||
{/* FRONT */}
|
||||
<div className="card-front flex flex-col items-center">
|
||||
<h1 className="text-lg font-bold">{data.name}</h1>
|
||||
<img className="avatar" src={data.image} alt={data.name} />
|
||||
<h2 className="text-lg text-center font-bold">Info</h2>
|
||||
<div className="w-full md:w-2/3">
|
||||
<table className="table-auto text-left">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>Species</th>
|
||||
<td>{data.species}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Gender</th>
|
||||
<td>{data.gender}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Status</th>
|
||||
<td>{data.status}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Origin</th>
|
||||
<td>{data.origin.name}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Last location</th>
|
||||
<td>{data.location.name}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
{/* BACK */}
|
||||
<div className="card-back">
|
||||
{/* You can put whatever you want here, like a background or extra info */}
|
||||
</div>
|
||||
<div
|
||||
className={`card bg-gray-300 flex flex-col items-center shadow-lg rounded p-1 transform transition ease-in-out ${
|
||||
isClicked || skipped ? "flip-card" : ""
|
||||
} md:hover:scale-105`}
|
||||
onClick={onClick}
|
||||
style={{ cursor: "pointer" }}
|
||||
>
|
||||
<div className="card-inner">
|
||||
{/* FRONT */}
|
||||
<div className="card-front flex flex-col items-center">
|
||||
<h1 className="text-lg font-bold">{data.name}</h1>
|
||||
<img className="avatar" src={data.image} alt={data.name} />
|
||||
<h2 className="text-lg text-center font-bold">Info</h2>
|
||||
<div className="w-full md:w-2/3">
|
||||
<table className="table-auto text-left">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>Species</th>
|
||||
<td>{data.species}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Gender</th>
|
||||
<td>{data.gender}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Status</th>
|
||||
<td>{data.status}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Origin</th>
|
||||
<td>{data.origin_name}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Last location</th>
|
||||
<td>{data.location_name}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
{/* BACK */}
|
||||
<div className="card-back">
|
||||
{/* You can put whatever you want here, like a background or extra info */}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
@@ -4,17 +4,19 @@ export interface OriginOrLocation {
|
||||
}
|
||||
|
||||
export interface Character {
|
||||
_id: string | { $oid: string };
|
||||
id: number;
|
||||
rmid: number;
|
||||
name: string;
|
||||
status: string;
|
||||
species: string;
|
||||
type: string;
|
||||
gender: string;
|
||||
origin: OriginOrLocation;
|
||||
location: OriginOrLocation;
|
||||
origin_name: string;
|
||||
origin_url: string;
|
||||
location_name: string;
|
||||
location_url: string;
|
||||
image: string;
|
||||
episode: string[];
|
||||
episode: string; // This will be a stringified JSON array!
|
||||
url: string;
|
||||
created: string;
|
||||
elo_rating: number;
|
||||
|
@@ -1,9 +1,10 @@
|
||||
import type { Character } from "./types";
|
||||
|
||||
export function getId(character: Character | null) {
|
||||
if (!character) return undefined;
|
||||
const id = character._id as string | { $oid: string } | undefined;
|
||||
if (typeof id === 'string') return id;
|
||||
if (id && typeof id.$oid === 'string') return id.$oid;
|
||||
return undefined;
|
||||
export function getEpisodes(character: Character): string[] {
|
||||
if (Array.isArray(character.episode)) return character.episode;
|
||||
try {
|
||||
return JSON.parse(character.episode);
|
||||
} catch {
|
||||
return [];
|
||||
}
|
||||
}
|
18
migrations/001_init.sql
Normal file
18
migrations/001_init.sql
Normal file
@@ -0,0 +1,18 @@
|
||||
CREATE TABLE characters (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
rmid INTEGER NOT NULL,
|
||||
name TEXT NOT NULL,
|
||||
status TEXT NOT NULL,
|
||||
species TEXT NOT NULL,
|
||||
type TEXT NOT NULL,
|
||||
gender TEXT NOT NULL,
|
||||
origin_name TEXT NOT NULL,
|
||||
origin_url TEXT NOT NULL,
|
||||
location_name TEXT NOT NULL,
|
||||
location_url TEXT NOT NULL,
|
||||
image TEXT NOT NULL,
|
||||
episode TEXT NOT NULL, -- store as comma-separated or JSON
|
||||
url TEXT NOT NULL,
|
||||
created TEXT NOT NULL,
|
||||
elo_rating REAL NOT NULL
|
||||
);
|
@@ -1,11 +1,7 @@
|
||||
use mongodb::{
|
||||
Client,
|
||||
bson::{doc, to_document},
|
||||
options::UpdateOptions,
|
||||
};
|
||||
use reqwest::Client as HttpClient;
|
||||
use rick_and_morty::models::{Character, OriginOrLocation};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sqlx::{Row, SqlitePool};
|
||||
|
||||
#[derive(Debug, Deserialize, Serialize)]
|
||||
struct ApiCharacter {
|
||||
@@ -27,17 +23,20 @@ struct ApiCharacter {
|
||||
impl From<ApiCharacter> for Character {
|
||||
fn from(api: ApiCharacter) -> Self {
|
||||
Character {
|
||||
id: None, // always None for new/incoming data
|
||||
id: 0, // Ignored for new/incoming data; SQLite autoincrements
|
||||
rmid: api.id,
|
||||
name: api.name,
|
||||
status: api.status,
|
||||
species: api.species,
|
||||
r#type: api.character_type,
|
||||
gender: api.gender,
|
||||
origin: api.origin,
|
||||
location: api.location,
|
||||
origin_name: api.origin.name,
|
||||
origin_url: api.origin.url,
|
||||
location_name: api.location.name,
|
||||
location_url: api.location.url,
|
||||
image: api.image,
|
||||
episode: api.episode,
|
||||
// Store as JSON string
|
||||
episode: serde_json::to_string(&api.episode).unwrap(),
|
||||
url: api.url,
|
||||
created: api.created,
|
||||
elo_rating: 1000.0,
|
||||
@@ -58,13 +57,9 @@ fn init_tracing() {
|
||||
async fn main() -> anyhow::Result<()> {
|
||||
init_tracing();
|
||||
dotenvy::dotenv().ok();
|
||||
let db_uri =
|
||||
std::env::var("MONGODB_URI").unwrap_or_else(|_| "mongodb://localhost:27017".to_string());
|
||||
let db_name = std::env::var("DB_NAME").unwrap_or_else(|_| "rick_and_morty".to_string());
|
||||
|
||||
let client = Client::with_uri_str(&db_uri).await?;
|
||||
let db = client.database(&db_name);
|
||||
let collection = db.collection::<Character>("characters");
|
||||
let db_url = std::env::var("DATABASE_URL").expect("DATABASE_URL not set");
|
||||
let pool = SqlitePool::connect(&db_url).await?;
|
||||
|
||||
tracing::info!("Starting to fetch characters from Rick and Morty API");
|
||||
let http = HttpClient::new();
|
||||
@@ -92,30 +87,77 @@ async fn main() -> anyhow::Result<()> {
|
||||
count = all_characters.len(),
|
||||
"Fetched all characters, starting DB upsert"
|
||||
);
|
||||
let options = UpdateOptions::builder().upsert(true).build();
|
||||
// let insert_result = collection.insert_many(all_characters.clone()).await?;
|
||||
|
||||
for character in &all_characters {
|
||||
let filter = doc! { "rmid": character.rmid };
|
||||
let mut set_doc = to_document(character)?;
|
||||
set_doc.remove("elo_rating"); // Do NOT overwrite existing Elo
|
||||
let update = doc! {
|
||||
"$set": set_doc,
|
||||
"$setOnInsert": { "elo_rating": 1000.0 }
|
||||
};
|
||||
if let Err(e) = collection
|
||||
.update_one(filter, update)
|
||||
.with_options(Some(options.clone()))
|
||||
.await
|
||||
{
|
||||
tracing::error!(error = ?e, id = character.rmid, name = %character.name, "Failed to upsert character");
|
||||
// Try to fetch existing character by rmid
|
||||
let row = sqlx::query("SELECT id, elo_rating FROM characters WHERE rmid = ?")
|
||||
.bind(character.rmid)
|
||||
.fetch_optional(&pool)
|
||||
.await?;
|
||||
|
||||
if let Some(row) = row {
|
||||
// Exists: update all fields except elo_rating
|
||||
let id: i64 = row.get("id");
|
||||
sqlx::query(
|
||||
"UPDATE characters SET
|
||||
name = ?, status = ?, species = ?, type = ?, gender = ?,
|
||||
origin_name = ?, origin_url = ?,
|
||||
location_name = ?, location_url = ?,
|
||||
image = ?, episode = ?, url = ?, created = ?
|
||||
WHERE id = ?",
|
||||
)
|
||||
.bind(&character.name)
|
||||
.bind(&character.status)
|
||||
.bind(&character.species)
|
||||
.bind(&character.r#type)
|
||||
.bind(&character.gender)
|
||||
.bind(&character.origin_name)
|
||||
.bind(&character.origin_url)
|
||||
.bind(&character.location_name)
|
||||
.bind(&character.location_url)
|
||||
.bind(&character.image)
|
||||
.bind(&character.episode)
|
||||
.bind(&character.url)
|
||||
.bind(&character.created)
|
||||
.bind(id)
|
||||
.execute(&pool)
|
||||
.await?;
|
||||
tracing::info!(id = character.rmid, name = %character.name, "Updated character (no elo overwrite)");
|
||||
} else {
|
||||
// Insert new character with default elo_rating
|
||||
sqlx::query(
|
||||
"INSERT INTO characters (
|
||||
rmid, name, status, species, type, gender,
|
||||
origin_name, origin_url, location_name, location_url,
|
||||
image, episode, url, created, elo_rating
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||
)
|
||||
.bind(character.rmid)
|
||||
.bind(&character.name)
|
||||
.bind(&character.status)
|
||||
.bind(&character.species)
|
||||
.bind(&character.r#type)
|
||||
.bind(&character.gender)
|
||||
.bind(&character.origin_name)
|
||||
.bind(&character.origin_url)
|
||||
.bind(&character.location_name)
|
||||
.bind(&character.location_url)
|
||||
.bind(&character.image)
|
||||
.bind(&character.episode)
|
||||
.bind(&character.url)
|
||||
.bind(&character.created)
|
||||
.bind(1000.0)
|
||||
.execute(&pool)
|
||||
.await?;
|
||||
tracing::info!(id = character.rmid, name = %character.name, "Inserted new character");
|
||||
}
|
||||
tracing::info!(id = character.rmid, name = %character.name, "Upserted character");
|
||||
}
|
||||
|
||||
// tracing::info!("Inserted {} characters", insert_result.inserted_ids.len());
|
||||
|
||||
let character_count = collection.count_documents(doc! {}).await?;
|
||||
let character_count: i64 = sqlx::query_scalar("SELECT COUNT(*) FROM characters")
|
||||
.fetch_one(&pool)
|
||||
.await?;
|
||||
tracing::info!(
|
||||
count = character_count,
|
||||
"Total characters in DB after import"
|
||||
|
13
src/db.rs
13
src/db.rs
@@ -1,11 +1,6 @@
|
||||
use mongodb::{Client, Database};
|
||||
use once_cell::sync::OnceCell;
|
||||
use sqlx::sqlite::SqlitePool;
|
||||
|
||||
pub static DB: OnceCell<Database> = OnceCell::new();
|
||||
|
||||
pub async fn connect_db(uri: &str, db_name: &str) -> mongodb::error::Result<()> {
|
||||
let client = Client::with_uri_str(uri).await?;
|
||||
let db = client.database(db_name);
|
||||
DB.set(db).ok();
|
||||
Ok(())
|
||||
pub async fn connect_db(db_url: &str) -> Result<SqlitePool, sqlx::Error> {
|
||||
let pool = SqlitePool::connect(db_url).await?;
|
||||
Ok(pool)
|
||||
}
|
||||
|
20
src/main.rs
20
src/main.rs
@@ -20,19 +20,17 @@ fn init_tracing() {
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
async fn main() -> anyhow::Result<()> {
|
||||
init_tracing();
|
||||
dotenvy::dotenv().ok();
|
||||
|
||||
let db_uri = std::env::var("MONGODB_URI").expect("MONGODB_URI not set");
|
||||
let db_name = std::env::var("DB_NAME").unwrap_or_else(|_| "rick_and_morty".to_string());
|
||||
let address = std::env::var("BIND_ADDR").unwrap_or_else(|_| "0.0.0.0:8000".to_string());
|
||||
let db_url = std::env::var("DATABASE_URL").expect("DATABASE_URL not set");
|
||||
|
||||
db::connect_db(&db_uri, &db_name)
|
||||
.await
|
||||
.expect("Failed to connect to database");
|
||||
let db = db::connect_db(&db_url).await?;
|
||||
|
||||
let db = db::DB.get().expect("Database not initialized");
|
||||
// migrations
|
||||
sqlx::migrate!().run(&db).await?;
|
||||
|
||||
let cors = CorsLayer::new()
|
||||
// allow `GET` and `POST` when accessing the resource
|
||||
@@ -44,7 +42,7 @@ async fn main() {
|
||||
let app = Router::new()
|
||||
.route("/characters", get(routes::get_characters))
|
||||
.route("/rate", post(routes::rate))
|
||||
.with_state(db.clone())
|
||||
.with_state(db)
|
||||
.layer(TraceLayer::new_for_http())
|
||||
.layer(cors)
|
||||
.fallback_service(ServeDir::new("frontend/dist").append_index_html_on_directories(true));
|
||||
@@ -55,5 +53,9 @@ async fn main() {
|
||||
|
||||
println!("Listening on {}", listener.local_addr().unwrap());
|
||||
|
||||
axum::serve(listener, app).await.unwrap();
|
||||
axum::serve(listener, app).await?;
|
||||
|
||||
tracing::info!("Server started successfully");
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
@@ -1,26 +1,27 @@
|
||||
use mongodb::bson::{doc, oid::ObjectId};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sqlx::prelude::FromRow;
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, FromRow)]
|
||||
pub struct OriginOrLocation {
|
||||
pub name: String,
|
||||
pub url: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, FromRow)]
|
||||
pub struct Character {
|
||||
#[serde(rename = "_id", skip_serializing_if = "Option::is_none")]
|
||||
pub id: Option<ObjectId>, // Mongo _id
|
||||
pub id: i64,
|
||||
pub rmid: i32, // Rick&Morty ID, don't confuse with _id
|
||||
pub name: String,
|
||||
pub status: String,
|
||||
pub species: String,
|
||||
pub r#type: String,
|
||||
pub gender: String,
|
||||
pub origin: OriginOrLocation,
|
||||
pub location: OriginOrLocation,
|
||||
pub origin_name: String,
|
||||
pub origin_url: String,
|
||||
pub location_name: String,
|
||||
pub location_url: String,
|
||||
pub image: String,
|
||||
pub episode: Vec<String>,
|
||||
pub episode: String,
|
||||
pub url: String,
|
||||
pub created: String,
|
||||
pub elo_rating: f64,
|
||||
|
@@ -1,10 +1,7 @@
|
||||
use axum::response::Html;
|
||||
use axum::{Json, extract::State, http::StatusCode};
|
||||
use futures_util::stream::TryStreamExt;
|
||||
use mongodb::Database;
|
||||
use mongodb::bson::doc;
|
||||
use mongodb::bson::oid::ObjectId;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sqlx::{Sqlite, SqlitePool, Transaction};
|
||||
|
||||
use crate::models::Character;
|
||||
use crate::utils::calculate_elo;
|
||||
@@ -15,7 +12,7 @@ pub struct RateRequest {
|
||||
loser_id: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Serialize)]
|
||||
#[derive(Serialize)]
|
||||
pub struct RateResponse {
|
||||
winner: Character,
|
||||
loser: Character,
|
||||
@@ -24,94 +21,74 @@ pub struct RateResponse {
|
||||
static K_FACTOR: f64 = 32.0; // K-factor for Elo rating system
|
||||
|
||||
pub async fn get_characters(
|
||||
State(db): State<Database>,
|
||||
State(db): State<SqlitePool>,
|
||||
) -> Result<Json<Vec<Character>>, StatusCode> {
|
||||
let collection = db.collection::<Character>("characters");
|
||||
let pipeline = vec![doc! { "$sort": { "elo_rating": -1 } }];
|
||||
|
||||
let mut cursor = collection
|
||||
.aggregate(pipeline)
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
let mut characters = Vec::new();
|
||||
while let Some(result) = cursor
|
||||
.try_next()
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
|
||||
{
|
||||
let character: Character =
|
||||
mongodb::bson::from_document(result).map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
characters.push(character);
|
||||
}
|
||||
|
||||
tracing::info!(count = characters.len(), "Fetched characters from DB");
|
||||
let characters =
|
||||
sqlx::query_as::<_, Character>("SELECT * FROM characters ORDER BY elo_rating DESC")
|
||||
.fetch_all(&db)
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
Ok(Json(characters))
|
||||
}
|
||||
|
||||
#[axum::debug_handler]
|
||||
pub async fn rate(
|
||||
State(db): State<Database>,
|
||||
State(db): State<SqlitePool>,
|
||||
Json(req): Json<RateRequest>,
|
||||
) -> Result<Json<RateResponse>, StatusCode> {
|
||||
let collection = db.collection::<Character>("characters");
|
||||
|
||||
let winner_oid = ObjectId::parse_str(&req.winner_id).map_err(|_| StatusCode::BAD_REQUEST)?;
|
||||
let loser_oid = ObjectId::parse_str(&req.loser_id).map_err(|_| StatusCode::BAD_REQUEST)?;
|
||||
|
||||
let winner = collection
|
||||
.find_one(doc! { "_id": winner_oid })
|
||||
// 1. Fetch characters by ID
|
||||
let winner: Character = sqlx::query_as("SELECT * FROM characters WHERE id = ?")
|
||||
.bind(&req.winner_id)
|
||||
.fetch_optional(&db)
|
||||
.await
|
||||
.ok()
|
||||
.flatten()
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
|
||||
.ok_or(StatusCode::NOT_FOUND)?;
|
||||
let loser = collection
|
||||
.find_one(doc! { "_id": loser_oid })
|
||||
|
||||
let loser: Character = sqlx::query_as("SELECT * FROM characters WHERE id = ?")
|
||||
.bind(&req.loser_id)
|
||||
.fetch_optional(&db)
|
||||
.await
|
||||
.ok()
|
||||
.flatten()
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
|
||||
.ok_or(StatusCode::NOT_FOUND)?;
|
||||
|
||||
let (new_winner_elo, new_loser_elo) =
|
||||
calculate_elo(winner.elo_rating, loser.elo_rating, K_FACTOR);
|
||||
|
||||
collection
|
||||
.update_one(
|
||||
doc! {"_id": &winner_oid},
|
||||
doc! { "$set": { "elo_rating": new_winner_elo } },
|
||||
)
|
||||
let mut tx: Transaction<'_, Sqlite> = db
|
||||
.begin()
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
collection
|
||||
.update_one(
|
||||
doc! {"_id": &loser_oid},
|
||||
doc! { "$set": { "elo_rating": new_loser_elo } },
|
||||
)
|
||||
sqlx::query("UPDATE characters SET elo_rating = ? WHERE id = ?")
|
||||
.bind(new_winner_elo)
|
||||
.bind(&req.winner_id)
|
||||
.execute(&mut *tx)
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
// return resposnse with characters' new Elo ratings
|
||||
let updated_winner = collection
|
||||
.find_one(doc! { "_id": winner_oid })
|
||||
sqlx::query("UPDATE characters SET elo_rating = ? WHERE id = ?")
|
||||
.bind(new_loser_elo)
|
||||
.bind(&req.loser_id)
|
||||
.execute(&mut *tx)
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
|
||||
.ok_or(StatusCode::NOT_FOUND)?;
|
||||
let updated_loser = collection
|
||||
.find_one(doc! { "_id": loser_oid })
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
|
||||
.ok_or(StatusCode::NOT_FOUND)?;
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
tracing::info!(
|
||||
"Rated characters: winner_id = {}, loser_id = {}, new_winner_elo =
|
||||
{}, new_loser_elo = {}",
|
||||
req.winner_id,
|
||||
req.loser_id,
|
||||
new_winner_elo,
|
||||
new_loser_elo
|
||||
);
|
||||
tx.commit()
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
let updated_winner: Character = sqlx::query_as("SELECT * FROM characters WHERE id = ?")
|
||||
.bind(&req.winner_id)
|
||||
.fetch_one(&db)
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
let updated_loser: Character = sqlx::query_as("SELECT * FROM characters WHERE id = ?")
|
||||
.bind(&req.loser_id)
|
||||
.fetch_one(&db)
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
Ok(Json(RateResponse {
|
||||
winner: updated_winner,
|
||||
|
Reference in New Issue
Block a user