gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #64 from djmitche/issue57

Browse Source 
Add RemoteServer to the taskchampion crate
This commit is contained in:
Dustin J. Mitchell
2020-11-27 20:23:39 -05:00
committed by GitHub
parent a02f864b87 2a37f090a5
commit 97a8a87c24
10 changed files with 322 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sync-server/src/api/add_version.rs
View File

@@ -2,7 +2,7 @@ use crate::api::{
failure_to_ise, ServerState, HISTORY_SEGMENT_CONTENT_TYPE, PARENT_VERSION_ID_HEADER,
VERSION_ID_HEADER,
};
use crate::server::{add_version, AddVersionResult, ClientId, VersionId};
use crate::server::{add_version, AddVersionResult, ClientId, VersionId, NO_VERSION_ID};
use actix_web::{error, post, web, HttpMessage, HttpRequest, HttpResponse, Result};
use futures::StreamExt;
@@ -51,10 +51,15 @@ pub(crate) async fn service(
// in transit.
let mut txn = server_state.txn().map_err(failure_to_ise)?;
let client = txn
.get_client(client_id)
.map_err(failure_to_ise)?
.ok_or_else(|| error::ErrorNotFound("no such client"))?;
// get, or create, the client
let client = match txn.get_client(client_id).map_err(failure_to_ise)? {
Some(client) => client,
None => {
txn.new_client(client_id, NO_VERSION_ID)
.map_err(failure_to_ise)?;
txn.get_client(client_id).map_err(failure_to_ise)?.unwrap()
}
};
let result = add_version(txn, client_id, client, parent_version_id, body.to_vec())
.map_err(failure_to_ise)?;
@@ -86,8 +91,7 @@ mod test {
// set up the storage contents..
{
let mut txn = server_box.txn().unwrap();
txn.set_client_latest_version_id(client_id, Uuid::nil())
.unwrap();
txn.new_client(client_id, Uuid::nil()).unwrap();
}
let server_state = ServerState::new(server_box);
@@ -123,8 +127,7 @@ mod test {
// set up the storage contents..
{
let mut txn = server_box.txn().unwrap();
txn.set_client_latest_version_id(client_id, version_id)
.unwrap();
txn.new_client(client_id, version_id).unwrap();
}
let server_state = ServerState::new(server_box);

6
sync-server/src/api/get_child_version.rs
View File

@@ -57,8 +57,7 @@ mod test {
// set up the storage contents..
{
let mut txn = server_box.txn().unwrap();
txn.set_client_latest_version_id(client_id, Uuid::new_v4())
.unwrap();
txn.new_client(client_id, Uuid::new_v4()).unwrap();
txn.add_version(client_id, version_id, parent_version_id, b"abcd".to_vec())
.unwrap();
}
@@ -119,8 +118,7 @@ mod test {
// create the client, but not the version
{
let mut txn = server_box.txn().unwrap();
txn.set_client_latest_version_id(client_id, Uuid::new_v4())
.unwrap();
txn.new_client(client_id, Uuid::new_v4()).unwrap();
}
let server_state = ServerState::new(server_box);
let mut app = test::init_service(App::new().service(app_scope(server_state))).await;