Add minor fixes
This commit is contained in:
		
							parent
							
								
									80d1fa32a0
								
							
						
					
					
						commit
						ee5d4e2126
					
				
					 6 changed files with 7 additions and 7 deletions
				
			
		
							
								
								
									
										1
									
								
								.env
									
										
									
									
									
								
							
							
						
						
									
										1
									
								
								.env
									
										
									
									
									
								
							| 
						 | 
					@ -1 +1,2 @@
 | 
				
			||||||
 | 
					# This is usually used in development by sqlx. It is not used in production
 | 
				
			||||||
DATABASE_URL=sqlite://emgauwa-core.sqlite
 | 
					DATABASE_URL=sqlite://emgauwa-core.sqlite
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										3
									
								
								.gitattributes
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								.gitattributes
									
										
									
									
										vendored
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,3 @@
 | 
				
			||||||
 | 
					* text=auto
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Cargo.lock -diff
 | 
				
			||||||
| 
						 | 
					@ -4,11 +4,6 @@ version = "0.1.0"
 | 
				
			||||||
edition = "2018"
 | 
					edition = "2018"
 | 
				
			||||||
authors = ["Tobias Reisinger <tobias@msrg.cc>"]
 | 
					authors = ["Tobias Reisinger <tobias@msrg.cc>"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#[profile.release]
 | 
					 | 
				
			||||||
#panic = 'abort'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[dependencies]
 | 
					[dependencies]
 | 
				
			||||||
actix-web = "4.4"
 | 
					actix-web = "4.4"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,6 +10,7 @@ pub enum ApiError {
 | 
				
			||||||
	BadUid,
 | 
						BadUid,
 | 
				
			||||||
	ProtectedSchedule,
 | 
						ProtectedSchedule,
 | 
				
			||||||
	DatabaseError(DatabaseError),
 | 
						DatabaseError(DatabaseError),
 | 
				
			||||||
 | 
						InternalError(String),
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
impl ApiError {
 | 
					impl ApiError {
 | 
				
			||||||
| 
						 | 
					@ -18,6 +19,7 @@ impl ApiError {
 | 
				
			||||||
			ApiError::BadUid => StatusCode::BAD_REQUEST,
 | 
								ApiError::BadUid => StatusCode::BAD_REQUEST,
 | 
				
			||||||
			ApiError::ProtectedSchedule => StatusCode::FORBIDDEN,
 | 
								ApiError::ProtectedSchedule => StatusCode::FORBIDDEN,
 | 
				
			||||||
			ApiError::DatabaseError(db_error) => db_error.get_code(),
 | 
								ApiError::DatabaseError(db_error) => db_error.get_code(),
 | 
				
			||||||
 | 
								ApiError::InternalError(_) => StatusCode::INTERNAL_SERVER_ERROR,
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -40,6 +42,7 @@ impl From<&ApiError> for String {
 | 
				
			||||||
			ApiError::BadUid => String::from("the uid is in a bad format"),
 | 
								ApiError::BadUid => String::from("the uid is in a bad format"),
 | 
				
			||||||
			ApiError::ProtectedSchedule => String::from("the targeted schedule is protected"),
 | 
								ApiError::ProtectedSchedule => String::from("the targeted schedule is protected"),
 | 
				
			||||||
			ApiError::DatabaseError(db_err) => String::from(db_err),
 | 
								ApiError::DatabaseError(db_err) => String::from(db_err),
 | 
				
			||||||
 | 
								ApiError::InternalError(msg) => msg.clone(),
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,3 @@
 | 
				
			||||||
extern crate dotenv;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
use std::str::FromStr;
 | 
					use std::str::FromStr;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
use actix_web::middleware::TrailingSlash;
 | 
					use actix_web::middleware::TrailingSlash;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue