Skip to content
This repository has been archived by the owner on Apr 24, 2024. It is now read-only.

Return 409 conflict when POST /maps with taken name. close #758 #1298

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions backend/src/model/entity/map_impl.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
//! Contains the implementation of [`Map`].

use diesel::dsl::sql;
use diesel::dsl::{exists, sql};
use diesel::pg::Pg;
use diesel::sql_types::Float;
use diesel::{
debug_query, BoolExpressionMethods, ExpressionMethods, PgTextExpressionMethods, QueryDsl,
QueryResult,
debug_query, select, BoolExpressionMethods, ExpressionMethods, PgTextExpressionMethods,
QueryDsl, QueryResult,
};
use diesel_async::{AsyncPgConnection, RunQueryDsl};
use log::debug;
Expand Down Expand Up @@ -87,6 +87,16 @@ impl Map {
query.first::<Self>(conn).await.map(Into::into)
}

/// Checks if a map with this name already exists in the database.
///
/// # Errors
/// * Unknown, diesel doesn't say why it might error.
pub async fn is_name_taken(map_name: &str, conn: &mut AsyncPgConnection) -> QueryResult<bool> {
let query = select(exists(maps::table.filter(name.eq(map_name))));
debug!("{}", debug_query::<Pg, _>(&query));
query.get_result(conn).await
}

/// Create a new map in the database.
///
/// # Errors
Expand Down
7 changes: 7 additions & 0 deletions backend/src/service/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ pub async fn create(
) -> Result<MapDto, ServiceError> {
let mut conn = app_data.pool.get().await?;

if Map::is_name_taken(&new_map.name, &mut conn).await? {
return Err(ServiceError::new(
StatusCode::CONFLICT,
"Map name already taken".to_owned(),
));
}

let geometry_validation_result = is_valid_map_geometry(&new_map.geometry);
if let Some(error) = geometry_validation_result {
return Err(error);
Expand Down
47 changes: 47 additions & 0 deletions backend/src/test/map.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//! Tests for [`crate::controller::map`].

use crate::model::dto::UpdateMapGeometryDto;
use crate::test::util::data;
use crate::test::util::dummy_map_polygons::small_rectangle;
use crate::{
model::{
Expand Down Expand Up @@ -165,6 +166,52 @@ async fn test_can_create_map() {
assert_eq!(resp.status(), StatusCode::OK);
}

#[actix_rt::test]
async fn test_conflict_on_create_map_with_taken_name() {
let taken_name = "taken name";
let pool = init_test_database(|conn| {
async {
diesel::insert_into(crate::schema::maps::table)
.values(data::TestInsertableMap {
name: taken_name.to_owned(),
..Default::default()
})
.execute(conn)
.await?;
Ok(())
}
.scope_boxed()
})
.await;
let (token, app) = init_test_app(pool.clone()).await;

let map_update = NewMapDto {
name: taken_name.to_owned(),
creation_date: NaiveDate::from_ymd_opt(2023, 5, 8).expect("Could not parse date!"),
deletion_date: None,
last_visit: None,
is_inactive: false,
zoom_factor: 100,
honors: 0,
visits: 0,
harvested: 0,
privacy: PrivacyOption::Public,
description: None,
location: None,
geometry: tall_rectangle(),
};

let resp = test::TestRequest::post()
.uri("/api/maps")
.insert_header((header::AUTHORIZATION, token))
.set_json(map_update)
.send_request(&app)
.await;

// Expect conflict since the map name is already present in the database
assert_eq!(resp.status(), StatusCode::CONFLICT);
}

#[actix_rt::test]
async fn test_update_fails_for_not_owner() {
let pool = init_test_database(|conn| {
Expand Down
2 changes: 1 addition & 1 deletion doc/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Syntax: `- short text describing the change _(Your Name)_`
- _()_
- Add points in middle of bezier polygon _(Daniel Steinkogler)_
- _()_
- _()_
- Return 409 Conflict when creating a map with taken name _(Jannis Adamek)_
- _()_
- _()_
- _()_
Expand Down