Get links Count

CHANGELOG-UNRELEASED.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added `properties` to entry definitions (not to the entries themselved). These can be retrieved using the `entry_type_properties` HDK function [#1337](https://github.com/holochain/holochain-rust/pull/1337)
+- *Breaking Change* Added type field to conductor network configuration.  You must add `type="n3h"` for current config files to work.  [#1540](https://github.com/holochain/holochain-rust/pull/1540)
+- Added `Encryption` and `Decryption` methods in the HDK [#1534](https://github.com/holochain/holochain-rust/pull/1534)
+- Adds `hc hash` CLI subcommand. Can be used to compute the hash of the DNA in the current dist directory or passed a path to a DNA with the --path flag [#1562](https://github.com/holochain/holochain-rust/pull/1562)
+- Adds a --dna flag to the CLI so `hc run` can run DNAs outside the standard ./dist/ directory [1561](https://github.com/holochain/holochain-rust/pull/1561)
+- Added a `get_links_count` and `get_links_count_by_tag` method which allows the user to get number of links by base , target or just by the tag. [#1568](https://github.com/holochain/holochain-rust/pull/1568)
+
 ### Changed
 
 ### Deprecated

app_spec/test/test.js

@@ -108,7 +108,7 @@ scenario('show_env', async (s, t, { alice }) => {
   t.equal(result.Ok.agent_id, '{"nick":"alice::app","pub_sign_key":"' + alice.app.agentId + '"}')
   t.equal(result.Ok.properties, '{"test_property":"test-property-value"}')
 
-  // don't compare the public token because it changes every time we change the dna.
+  // don't compare the public token because it changes every time we change the dna
   t.deepEqual(result.Ok.cap_request.provenance, [ alice.app.agentId, 'HFQkrDmnSOcmGQnYNtaYZWj89rlIQVFg0PpEoeFyx/Qw6Oizy5PI+tcsO8wYrllkuVPPzF5P3pvbCctKkfyGBg==' ]
 );
 
@@ -851,6 +851,137 @@ scenario('get_links_crud', async (s, t, { alice, bob }) => {
   t.equal("deleted",bob_posts_all.Ok.links[1].status);
 
 
+})
+
+scenario('get_links_crud_count', async (s, t, { alice, bob }) => {
+
+  //commits an entry and creates two links for alice
+  await alice.app.callSync("simple", "create_link",
+    { "base": alice.app.agentId ,"target": "Holo world" }
+  );
+
+  const alice_result = await alice.app.callSync("simple", "create_link",
+  { "base": alice.app.agentId ,"target": "Holo world 2" }
+  );
+
+  //get posts for alice from alice
+  const alice_posts_live= await alice.app.call("simple","get_my_links_count",
+  {
+    "base" : alice.app.agentId,"status_request":"Live"
+  })
+
+  //get posts for alice from bob
+  const bob_posts_live= await bob.app.call("simple","get_my_links_count",
+  {
+    "base" : alice.app.agentId,
+    "status_request":"Live"
+  })
+
+
+  //make sure count equals to 2
+  t.equal(2,alice_posts_live.Ok.count);
+  t.equal(2,bob_posts_live.Ok.count);
+
+
+  ////delete the holo world post from the links alice created
+  await alice.app.callSync("simple","delete_link",
+  {
+    "base" : alice.app.agentId,
+    "target" : "Holo world"
+  });
+
+  //get all bob posts
+  const bob_posts_deleted = await bob.app.call("simple","get_my_links_count",
+  {
+    "base" : alice.app.agentId,
+    "status_request" : "Deleted"
+  });
+
+  // get all posts with a deleted status from alice
+  const alice_posts_deleted = await alice.app.call("simple","get_my_links_count",
+  {
+    "base" : alice.app.agentId,
+    "status_request" : "Deleted"
+  });
+
+  //make sure  it is equal to 1
+  t.equal(1,alice_posts_deleted.Ok.count);
+  t.equal(1,bob_posts_deleted.Ok.count);
+
+
+
+
+})
+
+
+scenario('get_links_crud_count_tag', async (s, t, { alice, bob }) => {
+
+  //commits an entry and creates two links for alice
+  await alice.app.callSync("simple", "create_link_with_tag",
+    { "base": alice.app.agentId ,"target": "Holo world","tag":"tag1" }
+  );
+
+  const alice_result = await alice.app.callSync("simple", "create_link_with_tag",
+  { "base": bob.app.agentId ,"target": "Holo world 2","tag":"tag1" }
+  );
+
+  //get posts for alice from alice
+  const alice_posts_live= await alice.app.call("simple","get_my_links_count_by_tag",
+  {
+    "tag" : "tag1","status_request":"Live"
+  })
+
+  //get posts for alice from bob
+  const bob_posts_live= await alice.app.call("simple","get_my_links_count_by_tag",
+  {
+    "tag" : "tag1","status_request":"Live"
+  })
+
+  //make sure count equals to 2
+  t.equal(2,alice_posts_live.Ok.count);
+  t.equal(2,bob_posts_live.Ok.count);
+
+  //delete link
+  let deleted_link =  await alice.app.callSync("simple","delete_link_with_tag",
+  {
+    "base" : alice.app.agentId,
+    "target" : "Holo world",
+    "tag" : "tag1"
+  });
+
+
+  //get posts for alice from alice
+  const alice_posts_deleted= await alice.app.call("simple","get_my_links_count_by_tag",
+  {
+    "tag" : "tag1","status_request":"Deleted"
+  })
+
+  //get posts for alice from bob
+  const bob_posts_deleted= await alice.app.call("simple","get_my_links_count_by_tag",
+  {
+    "tag" : "tag1","status_request":"Deleted"
+  })
+
+  t.equal(1,alice_posts_deleted.Ok.count);
+  t.equal(1,bob_posts_deleted.Ok.count);
+
+
+  const alice_posts_all= await alice.app.call("simple","get_my_links_count_by_tag",
+  {
+    "tag" : "tag1","status_request":"All"
+  })
+
+  //get posts for alice from bob
+  const bob_posts_all= await alice.app.call("simple","get_my_links_count_by_tag",
+  {
+    "tag" : "tag1","status_request":"All"
+  })
+
+  t.equal(2,alice_posts_all.Ok.count);
+  t.equal(2,bob_posts_all.Ok.count);
+
+
+
 })
 
 scenario('create/get_post roundtrip', async (s, t, { alice }) => {

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

@@ -26,7 +26,7 @@ use hdk::holochain_json_api::{
 };
 
 
-use hdk::holochain_wasm_utils::api_serialization::get_links::{GetLinksResult,LinksStatusRequestKind,GetLinksOptions};
+use hdk::holochain_wasm_utils::api_serialization::get_links::{GetLinksResult,LinksStatusRequestKind,GetLinksOptions,GetLinksResultCount};
 
 
 // see https://developer.holochain.org/api/0.0.18-alpha1/hdk/ for info on using the hdk library
@@ -58,12 +58,24 @@ pub fn handle_create_my_link(base: Address,target : String) -> ZomeApiResult<()>
     Ok(())
 }
 
+pub fn handle_create_my_link_with_tag(base: Address,target : String,tag:String) -> ZomeApiResult<()> {
+    let address = hdk::commit_entry(&simple_entry(target))?;
+    hdk::link_entries(&base, &HashString::from(address), "authored_simple_posts", &tag)?;
+    Ok(())
+}
+
 pub fn handle_delete_my_link(base: Address,target : String) -> ZomeApiResult<()> {
     let address = hdk::entry_address(&simple_entry(target))?;
     hdk::remove_link(&base, &HashString::from(address), "authored_simple_posts", "")?;
     Ok(())
 }
 
+pub fn handle_delete_my_link_with_tag(base: Address,target : String,tag:String) -> ZomeApiResult<()> {
+    let address = hdk::entry_address(&simple_entry(target))?;
+    hdk::remove_link(&base, &HashString::from(address), "authored_simple_posts", &tag)?;
+    Ok(())
+}
+
 
 pub fn handle_get_my_links(agent : Address,status_request:Option<LinksStatusRequestKind>) ->ZomeApiResult<GetLinksResult>
 {
@@ -74,6 +86,24 @@ pub fn handle_get_my_links(agent : Address,status_request:Option<LinksStatusRequ
     hdk::get_links_with_options(&agent, LinkMatch::Exactly("authored_simple_posts"), LinkMatch::Any,options)
 }
 
+pub fn handle_get_my_links_count(agent : Address,status_request:Option<LinksStatusRequestKind>) ->ZomeApiResult<GetLinksResultCount>
+{
+    let options = GetLinksOptions{
+        status_request : status_request.unwrap_or(LinksStatusRequestKind::All),
+        ..GetLinksOptions::default()
+    };
+    hdk::get_links_count_with_options(&agent, LinkMatch::Exactly("authored_simple_posts"), LinkMatch::Any,options)
+}
+
+pub fn handle_get_my_links_by_tag_count(tag : String,status_request:Option<LinksStatusRequestKind>) ->ZomeApiResult<GetLinksResultCount>
+{
+    let options = GetLinksOptions{
+        status_request : status_request.unwrap_or(LinksStatusRequestKind::All),
+        ..GetLinksOptions::default()
+    };
+    hdk::get_links_count_by_tag(LinkMatch::Exactly(&tag),options)
+}
+
 pub fn handle_test_emit_signal(message: String) -> ZomeApiResult<()> {
     #[derive(Debug, Serialize, Deserialize, DefaultJson)]
     struct SignalPayload {
@@ -140,16 +170,36 @@ define_zome! {
             outputs: |result: ZomeApiResult<()>|,
             handler: handle_create_my_link
         }
+        create_link_with_tag: {
+            inputs: |base : Address,target:String,tag:String|,
+            outputs: |result: ZomeApiResult<()>|,
+            handler: handle_create_my_link_with_tag
+        }
         delete_link: {
             inputs: |base : Address,target:String|,
             outputs: |result: ZomeApiResult<()>|,
             handler: handle_delete_my_link
         }
+        delete_link_with_tag: {
+            inputs: |base : Address,target:String,tag:String|,
+            outputs: |result: ZomeApiResult<()>|,
+            handler: handle_delete_my_link_with_tag
+        }
         get_my_links: {
             inputs: |base: Address,status_request:Option<LinksStatusRequestKind>|,
             outputs: |result: ZomeApiResult<GetLinksResult>|,
             handler: handle_get_my_links
         }
+        get_my_links_count: {
+            inputs: |base: Address,status_request:Option<LinksStatusRequestKind>|,
+            outputs: |result: ZomeApiResult<GetLinksResultCount>|,
+            handler: handle_get_my_links_count
+        }
+        get_my_links_count_by_tag: {
+            inputs: |tag: String,status_request:Option<LinksStatusRequestKind>|,
+            outputs: |result: ZomeApiResult<GetLinksResultCount>|,
+            handler: handle_get_my_links_by_tag_count
+        }
         encrypt :{
             inputs : |payload: String|,
             outputs: |result: ZomeApiResult<String>|,
@@ -168,7 +218,8 @@ define_zome! {
     ]
 
     traits: {
-        hc_public [create_link, delete_link, get_my_links, test_emit_signal, encrypt, decrypt]
+        hc_public [create_link, delete_link, get_my_links, test_emit_signal,get_my_links_count,create_link_with_tag,get_my_links_count_by_tag,delete_link_with_tag,encrypt,decrypt]
+
     }
 }
 

app_spec_proc_macro/zomes/simple/code/src/lib.rs

@@ -27,7 +27,7 @@ use hdk::{
        json::JsonString,
        error::JsonError
     },
-    holochain_wasm_utils::api_serialization::get_links::{GetLinksResult,LinksStatusRequestKind,GetLinksOptions}
+    holochain_wasm_utils::api_serialization::get_links::{GetLinksResult,LinksStatusRequestKind,GetLinksOptions,GetLinksResultCount}
 };
 
 
@@ -107,13 +107,28 @@ pub mod simple {
         hdk::link_entries(&base, &address, "authored_simple_posts", "")?;
         Ok(())
     }
+
+    #[zome_fn("hc_public")]
+    pub fn create_link_with_tag(base: Address,target : String,tag:String) -> ZomeApiResult<()>
+    {
+        let address = hdk::commit_entry(&simple_entry(target))?;
+        hdk::link_entries(&base, &address, "authored_simple_posts", &tag)?;
+        Ok(())
+    }
     #[zome_fn("hc_public")]
     pub fn delete_link(base: Address,target : String) -> ZomeApiResult<()> {
         let address = hdk::entry_address(&simple_entry(target))?;
         hdk::remove_link(&base, &address, "authored_simple_posts", "")?;
         Ok(())
     }
 
+    #[zome_fn("hc_public")]
+    pub fn delete_link_with_tag(base: Address,target : String,tag:String) -> ZomeApiResult<()> {
+        let address = hdk::entry_address(&simple_entry(target))?;
+        hdk::remove_link(&base, &address, "authored_simple_posts", &tag)?;
+        Ok(())
+    }
+
     #[zome_fn("hc_public")]
     pub fn get_my_links(base: Address,status_request : Option<LinksStatusRequestKind>) -> ZomeApiResult<GetLinksResult>
     {
@@ -124,6 +139,26 @@ pub mod simple {
         hdk::get_links_with_options(&base, LinkMatch::Exactly("authored_simple_posts"), LinkMatch::Any,options)
     }
 
+    #[zome_fn("hc_public")]
+    pub fn get_my_links_count(base: Address,status_request : Option<LinksStatusRequestKind>) -> ZomeApiResult<GetLinksResultCount>
+    {
+        let options = GetLinksOptions{
+            status_request : status_request.unwrap_or(LinksStatusRequestKind::All),
+            ..GetLinksOptions::default()
+        };
+        hdk::get_links_count_with_options(&base, LinkMatch::Exactly("authored_simple_posts"), LinkMatch::Any,options)
+    }
+
+    #[zome_fn("hc_public")]
+    pub fn get_my_links_count_by_tag(tag : String,status_request:Option<LinksStatusRequestKind>) ->ZomeApiResult<GetLinksResultCount>
+    {
+    let options = GetLinksOptions{
+        status_request : status_request.unwrap_or(LinksStatusRequestKind::All),
+        ..GetLinksOptions::default()
+    };
+    hdk::get_links_count_by_tag(LinkMatch::Exactly(&tag),options)
+    }
+
     #[zome_fn("hc_public")]
     pub fn test_emit_signal(message: String) -> ZomeApiResult<()> {
         #[derive(Debug, Serialize, Deserialize, DefaultJson)]

core/src/action.rs

@@ -157,8 +157,15 @@ pub enum Action {
     /// Last string is the stringified process unique id of this `hdk::get_links` call.
     GetLinks(GetLinksKey),
     GetLinksTimeout(GetLinksKey),
+    GetLinksTimeoutByTag(GetLinksKeyByTag),
+    GetLinksCount((GetLinksKey, Option<CrudStatus>)),
+    GetLinksCountByTag((GetLinksKeyByTag, Option<CrudStatus>)),
     RespondGetLinks((QueryEntryData, Vec<(Address, CrudStatus)>, String, String)),
+    RespondGetLinksCount((QueryEntryData, usize, String, String)),
+    RespondGetLinksCountByTag((QueryEntryData, usize, String)),
     HandleGetLinksResult((Vec<(Address, CrudStatus)>, GetLinksKey)),
+    HandleGetLinksResultCount((usize, GetLinksKey)),
+    HandleGetLinksResultCountByTag((usize, GetLinksKeyByTag)),
 
     /// Makes the network module send a direct (node-to-node) message
     /// to the address given in [DirectMessageData](struct.DirectMessageData.html)
@@ -257,6 +264,17 @@ pub struct GetLinksKey {
     pub id: String,
 }
 
+/// The unique key that represents a GetLinksCountByTag request, used to associate the eventual
+/// response with this GetLinks request
+#[derive(Clone, PartialEq, Eq, Hash, Debug, Serialize)]
+pub struct GetLinksKeyByTag {
+    /// The link tag, None means get all the tags for a given type
+    pub tag: String,
+
+    /// A unique ID that is used to pair the eventual result to this request
+    pub id: String,
+}
+
 /// The unique key that represents a Get request, used to associate the eventual
 /// response with this Get request
 #[derive(Clone, PartialEq, Eq, Hash, Debug, Serialize)]