Fix issues?

Author: joepio

cli/src/main.rs

@@ -1,4 +1,3 @@
-use atomic_lib::atomic_url::Routes;
 use atomic_lib::{agents::generate_public_key, mapping::Mapping};
 use atomic_lib::{agents::Agent, config::Config};
 use atomic_lib::{errors::AtomicResult, Storelike};

lib/src/populate.rs

@@ -253,9 +253,8 @@ pub fn populate_collections(store: &impl Storelike) -> AtomicResult<()> {
 pub fn populate_endpoints(store: &crate::Db) -> AtomicResult<()> {
     use crate::atomic_url::Routes;
 
-    let endpoints = crate::plugins::default_endpoints();
     let endpoints_collection = store.get_server_url().set_route(Routes::Endpoints);
-    for endpoint in endpoints {
+    for endpoint in crate::endpoints::build_default_endpoints() {
         let mut resource = endpoint.to_resource(store)?;
         resource.set_propval(
             urls::PARENT.into(),
@@ -267,25 +266,6 @@ pub fn populate_endpoints(store: &crate::Db) -> AtomicResult<()> {
     Ok(())
 }
 
-#[cfg(feature = "db")]
-/// Adds default Endpoints (versioning) to the Db.
-/// Makes sure they are fetchable
-pub fn populate_importer(store: &crate::Db) -> AtomicResult<()> {
-    let base = store
-        .get_self_url()
-        .ok_or("No self URL in this Store - required for populating importer")?;
-    let mut importer = crate::Resource::new(urls::construct_path_import(&base));
-    importer.set_class(urls::IMPORTER);
-    importer.set_propval(
-        urls::PARENT.into(),
-        Value::AtomicUrl(base.to_string()),
-        store,
-    )?;
-    importer.set_propval(urls::NAME.into(), Value::String("Import".into()), store)?;
-    importer.save_locally(store)?;
-    Ok(())
-}
-
 #[cfg(feature = "db")]
 /// Adds items to the SideBar as subresources.
 /// Useful for helping a new user get started.

lib/src/resources.rs

@@ -2,10 +2,10 @@
 //! Has methods for saving resources and getting properties inside them.
 
 use crate::commit::{CommitOpts, CommitResponse};
-use crate::storelike::Query;
 use crate::urls;
 use crate::utils::random_string;
 use crate::values::{SubResource, Value};
+use crate::Query;
 use crate::{commit::CommitBuilder, errors::AtomicResult};
 use crate::{
     mapping::is_url,

lib/src/store.rs

@@ -184,7 +184,7 @@ impl Storelike for Store {
     fn get_server_url(&self) -> &AtomicUrl {
         // TODO Should be implemented later when companion functionality is here
         // https://github.com/atomicdata-dev/atomic-server/issues/6
-        "local:store"
+        &LOCAL_STORE_URL
     }
 
     fn get_self_url(&self) -> Option<&AtomicUrl> {

lib/src/storelike.rs

@@ -393,77 +393,3 @@ pub trait Storelike: Sized {
         crate::validate::validate_store(self, false)
     }
 }
-
-/// Use this to construct a list of Resources
-#[derive(Debug)]
-pub struct Query {
-    /// Filter by Property
-    pub property: Option<String>,
-    /// Filter by Value
-    pub value: Option<Value>,
-    /// Maximum of items to return, if none returns all items.
-    pub limit: Option<usize>,
-    /// Value at which to begin lexicographically sorting things.
-    pub start_val: Option<Value>,
-    /// Value at which to stop lexicographically sorting things.
-    pub end_val: Option<Value>,
-    /// How many items to skip from the first one
-    pub offset: usize,
-    /// The Property URL that is used to sort the results
-    pub sort_by: Option<String>,
-    /// Sort descending instead of ascending.
-    pub sort_desc: bool,
-    /// Whether to include non-server resources
-    pub include_external: bool,
-    /// Whether to include full Resources in the result, if not, will add empty vector here.
-    pub include_nested: bool,
-    /// For which Agent the query is executed. Pass `None` if you want to skip permission checks.
-    pub for_agent: ForAgent,
-}
-
-impl Query {
-    pub fn new() -> Self {
-        Query {
-            property: None,
-            value: None,
-            limit: None,
-            start_val: None,
-            end_val: None,
-            offset: 0,
-            sort_by: None,
-            sort_desc: false,
-            include_external: false,
-            include_nested: true,
-            for_agent: ForAgent::Sudo,
-        }
-    }
-
-    /// Search for a property-value combination
-    pub fn new_prop_val(prop: &str, val: &str) -> Self {
-        let mut q = Self::new();
-        q.property = Some(prop.to_string());
-        q.value = Some(Value::String(val.to_string()));
-        q
-    }
-
-    /// Search for instances of some Class
-    pub fn new_class(class: &str) -> Self {
-        let mut q = Self::new();
-        q.property = Some(urls::IS_A.into());
-        q.value = Some(Value::AtomicUrl(class.to_string()));
-        q
-    }
-}
-
-impl Default for Query {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-pub struct QueryResult {
-    pub subjects: Vec<String>,
-    pub resources: Vec<Resource>,
-    /// The amount of hits that were found, including the ones that were out of bounds or not authorized.
-    pub count: usize,
-}

lib/src/urls.rs

@@ -153,7 +153,4 @@ pub const PATH_REGISTER: &str = "/register";
 pub const PATH_CONFIRM_EMAIL: &str = "/confirm-email";
 pub const PATH_ADD_PUBKEY: &str = "/add-public-key";
 pub const PATH_CONFIRM_PUBKEY: &str = "/confirm-add-public-key";
-
-pub const PATH_IMPORT: &str = "/import";
-pub const PATH_FETCH_BOOKMARK: &str = "/fetch-bookmark";
 pub const PATH_QUERY: &str = "/query";