test

.github/workflows/checks.yml

@@ -0,0 +1,44 @@
+# Based on https://github.com/actions-rs/meta/blob/master/recipes/quickstart.md
+
+on: [push, pull_request]
+
+name: PushCheck
+
+jobs:
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      - name: Run cargo check
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+
+  test:
+    name: Test Suite
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test

trackscape-discord-api/src/services/osrs_broadcast_handler.rs

@@ -530,6 +530,7 @@ mod tests {
             clan_name: "Insomniacs".to_string(),
             rank: "Recruit".to_string(),
             icon_id: None,
+            is_league_world: None,
         };
 
         let mut registered_guild = RegisteredGuildModel::new(123);
@@ -584,6 +585,7 @@ mod tests {
             clan_name: "Insomniacs".to_string(),
             rank: "Recruit".to_string(),
             icon_id: None,
+            is_league_world: None,
         };
 
         let mut registered_guild = RegisteredGuildModel::new(123);
@@ -637,6 +639,7 @@ mod tests {
             clan_name: "Insomniacs".to_string(),
             rank: "Recruit".to_string(),
             icon_id: None,
+            is_league_world: None,
         };
 
         let mut registered_guild = RegisteredGuildModel::new(123);
@@ -690,6 +693,7 @@ mod tests {
             clan_name: "Insomniacs".to_string(),
             rank: "Recruit".to_string(),
             icon_id: None,
+            is_league_world: None,
         };
 
         let mut registered_guild = RegisteredGuildModel::new(123);
@@ -744,6 +748,7 @@ mod tests {
             clan_name: "Insomniacs".to_string(),
             rank: "Recruit".to_string(),
             icon_id: None,
+            is_league_world: None,
         };
 
         let mut registered_guild = RegisteredGuildModel::new(123);
@@ -795,6 +800,7 @@ mod tests {
             clan_name: "Insomniacs".to_string(),
             rank: "Recruit".to_string(),
             icon_id: None,
+            is_league_world: None,
         };
 
         let mut registered_guild = RegisteredGuildModel::new(123);
@@ -845,6 +851,7 @@ mod tests {
             clan_name: "Insomniacs".to_string(),
             rank: "Recruit".to_string(),
             icon_id: None,
+            is_league_world: None,
         };
 
         let mut registered_guild = RegisteredGuildModel::new(123);

trackscape-discord-shared/src/osrs_broadcast_extractor.rs

@@ -210,6 +210,12 @@ pub mod osrs_broadcast_extractor {
         pub value: i64,
     }
 
+    pub struct CollectionLogBroadcast {
+        pub player_it_happened_to: String,
+        pub item_name: String,
+        pub log_slots: i64,
+    }
+
     #[derive(PartialEq, Deserialize, Serialize, Debug, Clone)]
     pub enum BroadcastType {
         ItemDrop,
@@ -463,6 +469,23 @@ pub mod osrs_broadcast_extractor {
         };
     }
 
+    pub fn collection_log_broadcast_extractor(message: String) -> Option<CollectionLogBroadcast> {
+        let re = regex::Regex::new(r"^(?P<name>[\w\s]+) received a new collection log item: (?P<item>.+?) \((?P<number>\d+)/1477\)").unwrap();
+
+        if let Some(captures) = re.captures(message.as_str()) {
+            let name = captures.name("name").unwrap().as_str();
+            let item = captures.name("item").unwrap().as_str();
+            let number = captures.name("number").unwrap().as_str();
+
+            return Some(CollectionLogBroadcast {
+                player_it_happened_to: name.to_string(),
+                item_name: item.to_string(),
+                log_slots: number.parse().unwrap(),
+            });
+        }
+        None
+    }
+
     pub fn get_broadcast_type(message_content: String) -> BroadcastType {
         if message_content.contains("received a drop:") {
             return BroadcastType::ItemDrop;
@@ -544,9 +567,9 @@ pub mod osrs_broadcast_extractor {
 mod tests {
     use super::*;
     use crate::osrs_broadcast_extractor::osrs_broadcast_extractor::{
-        get_wiki_clan_rank_image_url, DiaryCompletedBroadcast, DiaryTier, InviteBroadcast,
-        LevelMilestoneBroadcast, PetDropBroadcast, PkBroadcast, QuestCompletedBroadcast,
-        XPMilestoneBroadcast,
+        get_wiki_clan_rank_image_url, CollectionLogBroadcast, DiaryCompletedBroadcast, DiaryTier,
+        InviteBroadcast, LevelMilestoneBroadcast, PetDropBroadcast, PkBroadcast,
+        QuestCompletedBroadcast, XPMilestoneBroadcast,
     };
     use tracing::info;
 
@@ -1003,6 +1026,30 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_collection_log_extractor() {
+        let test_collections = get_collection_log_messages();
+        for test_collection in test_collections {
+            let possible_collection_extract =
+                osrs_broadcast_extractor::collection_log_broadcast_extractor(
+                    test_collection.message.clone(),
+                );
+            let collection_extract = possible_collection_extract.unwrap();
+            assert_eq!(
+                collection_extract.log_slots,
+                test_collection.broadcast.log_slots
+            );
+            assert_eq!(
+                collection_extract.player_it_happened_to,
+                test_collection.broadcast.player_it_happened_to
+            );
+            assert_eq!(
+                collection_extract.item_name,
+                test_collection.broadcast.item_name
+            );
+        }
+    }
+
     #[test]
     fn test_rank_is_proper_wiki_image() {
         let rank = "Deputy Owner";
@@ -1062,6 +1109,11 @@ mod tests {
         xpmilestone_broadcast: XPMilestoneBroadcast,
     }
 
+    struct TestBroadcast<T> {
+        message: String,
+        broadcast: T,
+    }
+
     fn get_raid_messages() -> Vec<ItemMessageTest> {
         let mut possible_raid_broadcasts: Vec<ItemMessageTest> = Vec::new();
         possible_raid_broadcasts.push(ItemMessageTest {
@@ -1592,4 +1644,38 @@ mod tests {
 
         possible_xpmilestone_broadcasts
     }
+
+    fn get_collection_log_messages() -> Vec<TestBroadcast<CollectionLogBroadcast>> {
+        let mut test_collection_messages: Vec<TestBroadcast<CollectionLogBroadcast>> = Vec::new();
+        test_collection_messages.push(TestBroadcast {
+            message: "KANlEL OUTIS received a new collection log item: Elite void robe (170/1477)"
+                .to_string(),
+            broadcast: CollectionLogBroadcast {
+                player_it_happened_to: "KANlEL OUTIS".to_string(),
+                item_name: "Elite void robe".to_string(),
+                log_slots: 170,
+            },
+        });
+
+        test_collection_messages.push(TestBroadcast {
+            message: "S mf received a new collection log item: Charged ice (161/1477)".to_string(),
+            broadcast: CollectionLogBroadcast {
+                player_it_happened_to: "S mf".to_string(),
+                item_name: "Charged ice".to_string(),
+                log_slots: 161,
+            },
+        });
+
+        test_collection_messages.push(TestBroadcast {
+            message:
+                "Sad Bug received a new collection log item: Adamant platebody (h1) (895/1477)"
+                    .to_string(),
+            broadcast: CollectionLogBroadcast {
+                player_it_happened_to: "Sad Bug".to_string(),
+                item_name: "Adamant platebody (h1)".to_string(),
+                log_slots: 895,
+            },
+        });
+        test_collection_messages
+    }
 }