Skip to content

Improve test architecture and add environment configuration #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reddevilmidzy merged 6 commits into from
Oct 10, 2025
Merged

Improve test architecture and add environment configuration #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15494c8
refactor: Translate Korean comments to English in git.rs
reddevilmidzy Aug 2, 2025
b8e27c2
test: Use tempfile for automatic test cleanup
reddevilmidzy Aug 2, 2025
2e2178f
refactor: Improve test isolation and dependency injection
reddevilmidzy Sep 20, 2025
7656101
docs: Translate Korean comments to English in test files
reddevilmidzy Sep 20, 2025
39c7678
test: Change content-type to text/plain
reddevilmidzy Sep 20, 2025
9276235
refactor: Remove rand crate
reddevilmidzy Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
DATABASE_URL="postgres://postgres:password@localhost:5432/coduck"
UPLOAD_DIR="uploads"
3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ name = "coduck-backend"
anyhow = "1.0"
axum = { version = "0.8.4", features = ["json", "multipart"] }
chrono = { version = "0.4.38", features = ["serde"] }
dotenv = "0.15.0"
git2 = "0.20.2"
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.133"
Expand All @@ -23,3 +24,5 @@ uuid = { version = "1.17.0", features = ["v4"] }
[dev-dependencies]
reqwest = { version = "0.12.19", features = ["json", "rustls-tls"] }
rstest = "0.25.0"
serial_test = "3.2"
tempfile = "3.20"
228 changes: 172 additions & 56 deletions src/file_manager/git.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,28 @@ use git2::{DiffOptions, IndexAddOption, Repository, StatusOptions, Time};
use std::path::PathBuf;
use tokio::fs;

const UPLOAD_DIR: &str = "uploads";
const DEFAULT_DIRECTORIES: [&str; 3] = ["solutions", "tests", "statements"];

#[derive(Debug)]
struct GitManager {
problem_id: u32,
base_path: PathBuf,
}

impl GitManager {
fn new(problem_id: u32) -> Self {
Self { problem_id }
fn new(problem_id: u32, base_path: PathBuf) -> Self {
Self {
problem_id,
base_path,
}
}

fn get_upload_path(&self) -> PathBuf {
self.base_path.join(self.problem_id.to_string())
}

fn git_init(&self) -> Result<()> {
let path = PathBuf::from(UPLOAD_DIR).join(self.problem_id.to_string());
let path = self.get_upload_path();
Repository::init(&path)
.and_then(|repo| {
let mut config = repo.config()?;
Expand All @@ -28,7 +35,7 @@ impl GitManager {
Ok(repo)
})
.map(|_| ())
.with_context(|| format!("Failed to init git repo at {:?}", path))
.with_context(|| format!("Failed to init git repo at {path:?}"))
}

async fn create_problem(&self) -> Result<()> {
Expand Down Expand Up @@ -127,12 +134,12 @@ impl GitManager {
}

async fn create_default_directories(&self) -> Result<()> {
let base_path = PathBuf::from(UPLOAD_DIR).join(self.problem_id.to_string());
let base_path = self.get_upload_path();
for dir in DEFAULT_DIRECTORIES {
let path = base_path.join(dir);
fs::create_dir_all(path)
.await
.with_context(|| format!("Failed to create directory: {}", dir))?;
.with_context(|| format!("Failed to create directory: {dir}"))?;
}
Ok(())
}
Expand Down Expand Up @@ -169,9 +176,9 @@ impl GitManager {
}

fn get_repository(&self) -> Result<Repository> {
let path = PathBuf::from(UPLOAD_DIR).join(self.problem_id.to_string());
let path = self.get_upload_path();
Repository::open(&path)
.with_context(|| format!("Failed to open git repository at {:?}", path))
.with_context(|| format!("Failed to open git repository at {path:?}"))
}
}

Expand All @@ -194,6 +201,7 @@ mod tests {
use super::*;
use rstest::rstest;
use std::path::Path;
use tempfile::TempDir;
use tokio::fs;

#[rstest]
Expand Down Expand Up @@ -223,20 +231,24 @@ mod tests {

#[tokio::test]
async fn can_init_git_repository() -> Result<(), std::io::Error> {
let problem_id = 10;
let git_manager = GitManager::new(problem_id);
let temp_dir = TempDir::new()?;
let problem_id = 0;
let git_manager = GitManager::new(problem_id, temp_dir.path().to_path_buf());
assert!(git_manager.git_init().is_ok());
assert!(Path::new(format!("{UPLOAD_DIR}/{problem_id}").as_str()).exists());
assert!(Path::new(format!("{UPLOAD_DIR}/{problem_id}/.git").as_str()).exists());
assert!(Path::new(git_manager.get_upload_path().to_str().unwrap()).exists());
assert!(Path::new(
format!("{}/.git", git_manager.get_upload_path().to_str().unwrap()).as_str()
)
.exists());

fs::remove_dir_all(format!("{UPLOAD_DIR}/{problem_id}")).await?;
Ok(())
}

#[tokio::test]
async fn can_set_config() -> Result<(), std::io::Error> {
let problem_id = 11;
let git_manager = GitManager::new(problem_id);
let temp_dir = TempDir::new()?;
let problem_id = 0;
let git_manager = GitManager::new(problem_id, temp_dir.path().to_path_buf());
assert!(git_manager.git_init().is_ok());
let repo = git_manager.get_repository().unwrap();
let config = repo.config().unwrap();
Expand All @@ -246,48 +258,103 @@ mod tests {
Ok("admin@coduck.com".to_string())
);

fs::remove_dir_all(format!("{UPLOAD_DIR}/{problem_id}")).await?;
Ok(())
}

#[tokio::test]
async fn can_create_default_file() -> Result<(), std::io::Error> {
let problem_id = 12;
let git_manager = GitManager::new(problem_id);
let temp_dir = TempDir::new()?;
let problem_id = 0;
let git_manager = GitManager::new(problem_id, temp_dir.path().to_path_buf());
assert!(git_manager.create_default_directories().await.is_ok());
assert!(Path::new(format!("{UPLOAD_DIR}/{problem_id}/solutions").as_str()).exists());
assert!(Path::new(format!("{UPLOAD_DIR}/{problem_id}/tests").as_str()).exists());
assert!(Path::new(format!("{UPLOAD_DIR}/{problem_id}/statements").as_str()).exists());
assert!(Path::new(
format!(
"{}/solutions",
git_manager.get_upload_path().to_str().unwrap()
)
.as_str()
)
.exists());
assert!(Path::new(
format!("{}/tests", git_manager.get_upload_path().to_str().unwrap()).as_str()
)
.exists());
assert!(Path::new(
format!(
"{}/statements",
git_manager.get_upload_path().to_str().unwrap()
)
.as_str()
)
.exists());

fs::remove_dir_all(format!("{UPLOAD_DIR}/{problem_id}")).await?;
Ok(())
}

#[tokio::test]
async fn can_create_problem() -> Result<(), std::io::Error> {
let problem_id = 13;
let git_manager = GitManager::new(problem_id);
let temp_dir = TempDir::new()?;
let problem_id = 0;
let git_manager = GitManager::new(problem_id, temp_dir.path().to_path_buf());
assert!(git_manager.create_problem().await.is_ok());
assert!(Path::new(format!("{UPLOAD_DIR}/{problem_id}").as_str()).exists());
assert!(Path::new(format!("{UPLOAD_DIR}/{problem_id}/.git").as_str()).exists());
assert!(Path::new(format!("{UPLOAD_DIR}/{problem_id}/solutions").as_str()).exists());
assert!(Path::new(format!("{UPLOAD_DIR}/{problem_id}/tests").as_str()).exists());
assert!(Path::new(format!("{UPLOAD_DIR}/{problem_id}/statements").as_str()).exists());
assert!(Path::new(git_manager.get_upload_path().to_str().unwrap()).exists());
assert!(Path::new(
format!("{}/.git", git_manager.get_upload_path().to_str().unwrap()).as_str()
)
.exists());
assert!(Path::new(
format!(
"{}/solutions",
git_manager.get_upload_path().to_str().unwrap()
)
.as_str()
)
.exists());
assert!(Path::new(
format!("{}/tests", git_manager.get_upload_path().to_str().unwrap()).as_str()
)
.exists());
assert!(Path::new(
format!(
"{}/statements",
git_manager.get_upload_path().to_str().unwrap()
)
.as_str()
)
.exists());

fs::remove_dir_all(format!("{UPLOAD_DIR}/{problem_id}")).await?;
Ok(())
}

#[tokio::test]
async fn can_get_git_status() -> Result<(), tokio::io::Error> {
let problem_id = 14;
let git_manager = GitManager::new(problem_id);
let temp_dir = TempDir::new()?;
let problem_id = 0;
let git_manager = GitManager::new(problem_id, temp_dir.path().to_path_buf());

git_manager.git_init().unwrap();

fs::create_dir_all(format!("{UPLOAD_DIR}/{problem_id}/tests")).await?;
fs::write(format!("{UPLOAD_DIR}/{problem_id}/tests/1.in"), "1 2").await?;
fs::write(format!("{UPLOAD_DIR}/{problem_id}/tests/1.out"), "3").await?;
fs::create_dir_all(format!(
"{}/tests",
git_manager.get_upload_path().to_str().unwrap()
))
.await?;
fs::write(
format!(
"{}/tests/1.in",
git_manager.get_upload_path().to_str().unwrap()
),
"1 2",
)
.await?;
fs::write(
format!(
"{}/tests/1.out",
git_manager.get_upload_path().to_str().unwrap()
),
"3",
)
.await?;

let file_infos = git_manager.git_status().unwrap();
let expected = vec![
Expand All @@ -302,47 +369,83 @@ mod tests {
];
assert_eq!(file_infos, expected);

fs::remove_dir_all(format!("{UPLOAD_DIR}/{problem_id}")).await?;
Ok(())
}

#[tokio::test]
async fn can_git_add() -> Result<(), tokio::io::Error> {
let problem_id = 15;
let git_manager = GitManager::new(problem_id);
let temp_dir = TempDir::new()?;
let problem_id = 0;
let git_manager = GitManager::new(problem_id, temp_dir.path().to_path_buf());

git_manager.git_init().unwrap();

let repo = git_manager.get_repository().unwrap();
fs::create_dir_all(format!("{UPLOAD_DIR}/{problem_id}/tests")).await?;
fs::write(format!("{UPLOAD_DIR}/{problem_id}/tests/1.in"), "1 2").await?;
fs::write(format!("{UPLOAD_DIR}/{problem_id}/tests/1.out"), "3").await?;
fs::create_dir_all(format!(
"{}/tests",
git_manager.get_upload_path().to_str().unwrap()
))
.await?;
fs::write(
format!(
"{}/tests/1.in",
git_manager.get_upload_path().to_str().unwrap()
),
"1 2",
)
.await?;
fs::write(
format!(
"{}/tests/1.out",
git_manager.get_upload_path().to_str().unwrap()
),
"3",
)
.await?;

assert!(git_manager.git_add_all().is_ok());

let statuses = repo.statuses(None).unwrap();

// 워킹 디렉토리에 존재하지 않아야 한다.
// Should not exist in working directory
assert!(!statuses.iter().any(|e| e.status().is_wt_new()));
assert!(!statuses.iter().any(|e| e.status().is_wt_modified()));
assert!(!statuses.iter().any(|e| e.status().is_wt_deleted()));

// 스테이징 영역에 올라와야 한다.
// Should be in staging area
assert!(statuses.iter().all(|e| e.status().is_index_new()));

fs::remove_dir_all(format!("{UPLOAD_DIR}/{problem_id}")).await?;
Ok(())
}

#[tokio::test]
async fn can_commit() -> Result<(), tokio::io::Error> {
let problem_id = 16;
let git_manager = GitManager::new(problem_id);
let temp_dir = TempDir::new()?;
let problem_id = 0;
let git_manager = GitManager::new(problem_id, temp_dir.path().to_path_buf());
git_manager.git_init().unwrap();

fs::create_dir_all(format!("{UPLOAD_DIR}/{problem_id}/tests")).await?;
fs::write(format!("{UPLOAD_DIR}/{problem_id}/tests/1.in"), "1 2").await?;
fs::write(format!("{UPLOAD_DIR}/{problem_id}/tests/1.out"), "3").await?;
fs::create_dir_all(format!(
"{}/tests",
git_manager.get_upload_path().to_str().unwrap()
))
.await?;
fs::write(
format!(
"{}/tests/1.in",
git_manager.get_upload_path().to_str().unwrap()
),
"1 2",
)
.await?;
fs::write(
format!(
"{}/tests/1.out",
git_manager.get_upload_path().to_str().unwrap()
),
"3",
)
.await?;

let commit_message = "add test 1";

Expand All @@ -354,19 +457,33 @@ mod tests {

assert_eq!(commit.message(), Some(commit_message));

fs::remove_dir_all(format!("{UPLOAD_DIR}/{problem_id}")).await?;
Ok(())
}

#[tokio::test]
async fn can_get_log() -> Result<(), tokio::io::Error> {
let problem_id = 17;
let git_manager = GitManager::new(problem_id);
let temp_dir = TempDir::new()?;
let problem_id = 0;
let git_manager = GitManager::new(problem_id, temp_dir.path().to_path_buf());
git_manager.git_init().unwrap();
git_manager.create_default_directories().await.unwrap();

fs::write(format!("{UPLOAD_DIR}/{problem_id}/tests/1.in"), "1 2").await?;
fs::write(format!("{UPLOAD_DIR}/{problem_id}/tests/1.out"), "3").await?;
fs::write(
format!(
"{}/tests/1.in",
git_manager.get_upload_path().to_str().unwrap()
),
"1 2",
)
.await?;
fs::write(
format!(
"{}/tests/1.out",
git_manager.get_upload_path().to_str().unwrap()
),
"3",
)
.await?;

git_manager
.git_commit("create default file".to_string())
Expand All @@ -386,7 +503,6 @@ mod tests {
];
assert_eq!(log[0].paths, expected_path);

fs::remove_dir_all(format!("{UPLOAD_DIR}/{problem_id}")).await?;
Ok(())
}
}
Loading
Loading