Remove Link

app_spec/test/test.js

@@ -16,7 +16,7 @@ const scenario1 = new Scenario([instanceAlice])
 const scenario2 = new Scenario([instanceAlice, instanceBob])
 const scenario3 = new Scenario([instanceAlice, instanceBob, instanceCarol])
 
-scenario2.runTape('agentId', async (t, { alice, bob }) => {
+/*scenario2.runTape('agentId', async (t, { alice, bob }) => {
   t.ok(alice.agentId)
   t.notEqual(alice.agentId, bob.agentId)
 })
@@ -77,29 +77,55 @@ scenario1.runTape('create_post', async (t, { alice }) => {
   t.ok(result.Ok)
   t.notOk(result.Err)
   t.equal(result.Ok, "QmY6MfiuhHnQ1kg7RwNZJNUQhwDxTFL45AAPnpJMNPEoxk")
-})
-
-
-scenario1.runTape('delete_post', async (t, { alice }) => {
-  t.plan(3)
-
-  const content = "Hello Holo world 321"
-  const in_reply_to = null
-  const params = { content, in_reply_to }
-  const createResult = alice.call("blog", "create_post", params)
+})*/
 
-  t.ok(createResult.Ok)
+scenario2.runTape('delete_post', async (t, { alice, bob }) => {
 
-  const deletionParams = { post_address: createResult.Ok }
-  const deletionResult = alice.call("blog", "delete_post", deletionParams)
+  //create post
+ await alice.callSync("blog", "create_post",
+    { "content": "Posty", "in_reply_to": "" }
+  )
 
-  t.equals(deletionResult.Ok, null)
+
+  // get posts by bob
+  const bob_agent_posts = bob.call("blog", "my_posts", {})
 
-  const paramsGet = { post_address: createResult.Ok }
-  const result = alice.call("blog", "get_post", paramsGet)
+   t.ok(bob_agent_posts.Ok)
+   t.equal(bob_agent_posts.Ok.addresses.length, 1);
 
-  t.equals(result.Ok, null)
-})
+  //remove link by alicce
+    await alice.callSync("blog", "delete_post",
+    { "content": "Posty", "in_reply_to": "" }
+  )
+
+  // get posts by bob
+  const bob_agent_posts = bob.call("blog", "my_posts", {})
+
+  t.Ok(bob_agent_posts.Ok)
+  t.equal(bob_agent_posts.Ok.addresses.length, 0);
+
+  })
+
+  /*scenario1.runTape('delete_entry_post', async (t, { alice }) => {
+    t.plan(3)
+
+    const content = "Hello Holo world 321"
+    const in_reply_to = null
+    const params = { content, in_reply_to }
+    const createResult = alice.call("blog", "create_post", params)
+
+    t.ok(createResult.Ok)
+
+    const deletionParams = { post_address: createResult.Ok }
+    const deletionResult = alice.call("blog", "delete_entry_post", deletionParams)
+
+    t.equals(deletionResult.Ok, null)
+
+    const paramsGet = { post_address: createResult.Ok }
+    const result = alice.call("blog", "get_post", paramsGet)
+
+    t.equals(result.Ok, null)
+  })
 
 scenario1.runTape('update_post', async (t, { alice }) => {
   t.plan(4)
@@ -123,7 +149,7 @@ scenario1.runTape('update_post', async (t, { alice }) => {
   t.deepEqual(JSON.parse(updatedPost.Ok.App[1]), { content: "Hello Holo", date_created: "now" })
 })
 
-scenario1.runTape('create_post with bad reply to', async (t, { alice }) => {
+ scenario1.runTape('create_post with bad reply to', async (t, { alice }) => {
   t.plan(5)
 
   const content = "Holo world"
@@ -138,9 +164,25 @@ scenario1.runTape('create_post with bad reply to', async (t, { alice }) => {
   t.deepEqual(error.kind, { ErrorGeneric: "Base for link not found" })
   t.ok(error.file)
   t.equal(error.line, "94")
-})
+})*/
+
+/*scenario2.runTape('delete_post_with_bad_link', async (t, { alice, bob }) => {
 
-scenario1.runTape('post max content size 280 characters', async (t, { alice }) => {
+  const result_bob_delete = await bob.callSync("blog", "delete_post",
+    { "content": "Bad"}
+  )
+
+   // bad in_reply_to is an error condition
+   t.ok(result_bob_delete.Err)
+   t.notOk(result_bob_delete.Ok)
+   const error = JSON.parse(result_bob_delete.Err.Internal)
+   t.deepEqual(error.kind, { ErrorGeneric: "Target for link not found" })
+   t.ok(error.file)
+   t.equal(error.line, "94")
+
+  })*/
+
+/*scenario1.runTape('post max content size 280 characters', async (t, { alice }) => {
 
   const content = "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
   const in_reply_to = null
@@ -246,4 +288,4 @@ scenario2.runTape('scenario test create & publish post -> get from other instanc
   const result = bob.call("blog", "get_post", params_get)
   const value = JSON.parse(result.Ok.App[1])
   t.equal(value.content, initialContent)
-})
+})*/

app_spec/zomes/blog/code/src/blog.rs

@@ -100,6 +100,35 @@ pub fn handle_create_post(content: String, in_reply_to: Option<Address>) -> Zome
     Ok(address)
 }
 
+pub fn handle_post_reply_to(content: String, in_reply_to: Option<Address>) -> ZomeApiResult<Address>
+{
+    let address = hdk::entry_address(&post_entry(content))?;
+    if let Some(in_reply_to_address) = in_reply_to {
+        hdk::link_entries(&in_reply_to_address, &address, "comments")?;
+    }
+    Ok(address)
+}
+
+pub fn handle_delete_reply_to(content: String, in_reply_to: Option<Address>) -> ZomeApiResult<Address>
+{
+    let address = hdk::entry_address(&post_entry(content))?;
+    if let Some(in_reply_to_address) = in_reply_to {
+        hdk::remove_link(&in_reply_to_address, &address, "comments")?;
+    }
+    Ok(address)
+}
+
+pub fn handle_my_replies(address : Address) -> ZomeApiResult<GetLinksResult> {
+    hdk::get_links(&address, "comments")
+}
+
+pub fn handle_delete_post(content:String) -> ZomeApiResult<Address>
+{
+    let address = hdk::entry_address(&post_entry(content))?;
+    hdk::remove_link(&AGENT_ADDRESS,&address.clone(),"authored_posts")?;
+    Ok(address)
+}
+
 pub fn handle_posts_by_agent(agent: Address) -> ZomeApiResult<GetLinksResult> {
     hdk::get_links(&agent, "authored_posts")
 }
@@ -137,7 +166,7 @@ pub fn handle_get_post(post_address: Address) -> ZomeApiResult<Option<Entry>> {
     hdk::get_entry(&post_address)
 }
 
-pub fn handle_delete_post(post_address: Address) -> ZomeApiResult<()> {
+pub fn handle_delete_entry_post(post_address: Address) -> ZomeApiResult<()> {
     hdk::get_entry(&post_address)?;
 
     hdk::remove_entry(&post_address)?;

app_spec/zomes/blog/code/src/lib.rs

@@ -66,9 +66,33 @@ define_zome! {
         }
 
         delete_post: {
+            inputs: |content: String|,
+            outputs: |result: ZomeApiResult<Address>|,
+            handler: blog::handle_delete_post
+        }
+
+        delete_entry_post: {
             inputs: |post_address: Address|,
             outputs: |result: ZomeApiResult<()>|,
-            handler: blog::handle_delete_post
+            handler: blog::handle_delete_entry_post
+        }
+
+        delete_reply_to : {
+            inputs: |content: String, in_reply_to: Option<Address>|,
+            outputs: |result: ZomeApiResult<Address>|,
+            handler: blog::handle_delete_reply_to
+        }
+
+        post_reply_to : {
+            inputs: |content: String, in_reply_to: Option<Address>|,
+            outputs: |result: ZomeApiResult<Address>|,
+            handler: blog::handle_post_reply_to
+        }
+
+        replies : {
+            inputs: |address:Address|,
+            outputs: |post_hashes: ZomeApiResult<GetLinksResult>|,
+            handler: blog::handle_my_replies
         }
 
         update_post: {
@@ -121,7 +145,7 @@ define_zome! {
     ]
 
     capabilities: {
-        public (Public) [show_env, check_sum, get_sources, post_address, create_post, delete_post, update_post, posts_by_agent, get_post, my_posts, my_posts_as_committed, my_posts_immediate_timeout, recommend_post, my_recommended_posts]
+        public (Public) [show_env, check_sum, get_sources, post_address, create_post, delete_post, update_post, posts_by_agent, get_post, my_posts, my_posts_as_committed, my_posts_immediate_timeout, recommend_post, my_recommended_posts,delete_reply_to,post_reply_to,replies]
     }
 
 }

cas_implementations/src/eav/file.rs

@@ -193,22 +193,44 @@ impl EntityAttributeValueStorage for EavFileStorage {
         index_query: IndexQuery,
     ) -> Result<BTreeSet<EntityAttributeValueIndex>, HolochainError> {
         let _guard = self.lock.read()?;
-        let entity_set = self.read_from_dir::<Entity>(ENTITY_DIR.to_string(), entity.clone())?;
-        let attribute_set = self
-            .read_from_dir::<Attribute>(ATTRIBUTE_DIR.to_string(), attribute)?
-            .clone();
-        let value_set = self.read_from_dir::<Value>(VALUE_DIR.to_string(), value)?;
-
-        let attribute_value_inter: BTreeSet<String> = value_set
-            .intersection(&attribute_set.clone())
-            .cloned()
-            .collect();
-        let entity_attribute_value_inter: BTreeSet<String> = attribute_value_inter
-            .intersection(&entity_set)
-            .cloned()
-            .collect();
-
-        let (eav, error): (BTreeSet<_>, BTreeSet<_>) = entity_attribute_value_inter
+        let prefixes = if !index_query.prefixes().is_empty() {
+            index_query.prefixes().clone()
+        } else {
+            vec![""]
+        };
+        let union_set: BTreeSet<String> = BTreeSet::new();
+        let entity_attribute_value_union = prefixes.iter().fold(
+            Ok(union_set.clone()),
+            |set: Result<BTreeSet<String>, HolochainError>, prefix: &&str| {
+                let entity_set =
+                    self.read_from_dir::<Entity>(ENTITY_DIR.to_string(), entity.clone())?;
+                let attribute_with_prefix = attribute
+                    .clone()
+                    .map(|attri| prefix.to_string() + &attri.clone());
+                let attribute_set = self
+                    .read_from_dir::<Attribute>(ATTRIBUTE_DIR.to_string(), attribute_with_prefix)
+                    .clone()?;
+                let value_set =
+                    self.read_from_dir::<Value>(VALUE_DIR.to_string(), value.clone())?;
+
+                let attribute_value_inter: BTreeSet<String> = value_set
+                    .intersection(&attribute_set.clone())
+                    .cloned()
+                    .collect();
+                let entity_attribute_value_inter: BTreeSet<String> = attribute_value_inter
+                    .intersection(&entity_set)
+                    .cloned()
+                    .collect();
+                let to_union = set?;
+                Ok(to_union
+                    .union(&entity_attribute_value_inter)
+                    .cloned()
+                    .collect())
+            },
+        );
+
+        let (eav, error): (BTreeSet<_>, BTreeSet<_>) = entity_attribute_value_union?
+            .clone()
             .into_iter()
             .map(|content| EntityAttributeValueIndex::try_from_content(&JsonString::from(content)))
             .partition(|c| c.is_ok());
@@ -232,7 +254,7 @@ impl EntityAttributeValueStorage for EavFileStorage {
                         .start()
                         .map(|start| start <= e.index())
                         .unwrap_or_else(|| {
-                            let latest = get_latest(e.clone(), map.clone())
+                            let latest = get_latest(e.clone(), map.clone(), index_query.clone())
                                 .unwrap_or(EntityAttributeValueIndex::default());
                             latest.index() == e.index()
                         })
@@ -242,7 +264,7 @@ impl EntityAttributeValueStorage for EavFileStorage {
                         .end()
                         .map(|end| end >= e.index())
                         .unwrap_or_else(|| {
-                            let latest = get_latest(e.clone(), map.clone())
+                            let latest = get_latest(e.clone(), map.clone(), index_query.clone())
                                 .unwrap_or(EntityAttributeValueIndex::default());
                             latest.index() == e.index()
                         })
@@ -301,11 +323,22 @@ pub mod tests {
     }
 
     #[test]
-    fn example_eav_range() {
+    fn file_eav_range() {
         let temp = tempdir().expect("test was supposed to create temp dir");
         let temp_path = String::from(temp.path().to_str().expect("temp dir could not be string"));
         let eav_storage = EavFileStorage::new(temp_path).unwrap();
         EavTestSuite::test_range::<ExampleAddressableContent, EavFileStorage>(eav_storage);
     }
 
+    #[test]
+    fn file_eav_prefixes() {
+        let temp = tempdir().expect("test was supposed to create temp dir");
+        let temp_path = String::from(temp.path().to_str().expect("temp dir could not be string"));
+        let eav_storage = EavFileStorage::new(temp_path).unwrap();
+        EavTestSuite::test_prefixes::<ExampleAddressableContent, EavFileStorage>(
+            eav_storage,
+            vec!["a_", "b_", "c_", "d_"],
+        );
+    }
+
 }

cas_implementations/src/eav/memory.rs

@@ -57,15 +57,19 @@ impl EntityAttributeValueStorage for EavMemoryStorage {
             .into_iter()
             .filter(|e| EntityAttributeValueIndex::filter_on_eav(&e.entity(), entity.as_ref()))
             .filter(|e| {
-                EntityAttributeValueIndex::filter_on_eav(&e.attribute(), attribute.as_ref())
+                EntityAttributeValueIndex::filter_on_eav_with_prefix(
+                    &e.attribute(),
+                    attribute.as_ref(),
+                    &index_query,
+                )
             })
             .filter(|e| EntityAttributeValueIndex::filter_on_eav(&e.value(), value.as_ref()))
             .filter(|e| {
                 index_query
                     .start()
                     .map(|start| start <= e.index())
                     .unwrap_or_else(|| {
-                        let latest = get_latest(e.clone(), map.clone())
+                        let latest = get_latest(e.clone(), map.clone(), index_query.clone())
                             .unwrap_or(EntityAttributeValueIndex::default());
                         latest.index() == e.index()
                     })
@@ -75,7 +79,7 @@ impl EntityAttributeValueStorage for EavMemoryStorage {
                     .end()
                     .map(|end| end >= e.index())
                     .unwrap_or_else(|| {
-                        let latest = get_latest(e.clone(), map.clone())
+                        let latest = get_latest(e.clone(), map.clone(), index_query.clone())
                             .unwrap_or(EntityAttributeValueIndex::default());
                         latest.index() == e.index()
                     })
@@ -128,4 +132,13 @@ pub mod tests {
         EavTestSuite::test_range::<ExampleAddressableContent, EavMemoryStorage>(eav_storage);
     }
 
+    #[test]
+    fn file_eav_prefixes() {
+        let eav_storage = EavMemoryStorage::new();
+        EavTestSuite::test_prefixes::<ExampleAddressableContent, EavMemoryStorage>(
+            eav_storage,
+            vec!["a_", "b_", "c_", "d_"],
+        );
+    }
+
 }

core/src/action.rs

@@ -100,6 +100,9 @@ pub enum Action {
     /// Does not validate, assumes link is valid.
     AddLink(Link),
 
+    //Removes a link for the local DHT
+    RemoveLink(Link),
+
     // ----------------
     // Network actions:
     // ----------------

core/src/dht/actions/mod.rs

@@ -1,3 +1,4 @@
 pub mod add_link;
 pub mod hold;
 pub mod remove_entry;
+pub mod remove_link;