Merge pull request #381 from dlsc-software-consulting-gmbh/feature/#380

Added bluesky link to people and members
dlsc-software-consulting-gmbh · Nov 20, 2024 · 04b4afa · 04b4afa
2 parents 66d3777 + cbe9247
commit 04b4afa
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 1 deletion.
diff --git a/members/members.json b/members/members.json
@@ -6,6 +6,7 @@
     "website": "https://www.dlsc.com",
     "linkedIn": "dlemmermann",
     "twitter": "dlemmermann",
+    "bluesky": "dlemmermann.bsky.social",
     "gitHub": "dlemmermann",
     "champion": true,
     "rockstar": true,
@@ -63,6 +64,7 @@
     "linkedIn": "frankdelporte",
     "twitter": "frankdelporte",
     "mastodon": "https://foojay.social/@frankdelporte",
+    "bluesky": "frankdelporte.bsky.social",
     "gitHub": "fdelporte",
     "champion": true,
     "rockstar": false,

diff --git a/people/people.json b/people/people.json
@@ -90,6 +90,7 @@
     "blogId": "pixel-perfect",
     "linkedIn": "dlemmermann",
     "twitter": "dlemmermann",
+    "bluesky": "dlemmermann.bsky.social",
     "champion": true,
     "rockstar": true,
     "id": "d.lemmermann",
@@ -150,6 +151,7 @@
     "linkedIn": "frankdelporte",
     "twitter": "FrankDelporte",
     "mastodon": "https://foojay.social/@frankdelporte",
+    "bluesky": "frankdelporte.bsky.social",
     "champion": true,
     "rockstar": false,
     "id": "f.delporte",
@@ -837,8 +839,9 @@
     "website": "",
     "gitHub": "CodeSimcoe",
     "blogId": "",
-    "linkedIn": "cl%C3%A9ment-de-tastes-a19734120/",
+    "linkedIn": "clement-de-tastes",
     "twitter": "cdetastes",
+    "bluesky": "cdetastes.bsky.social",
     "champion": false,
     "rockstar": false,
     "id": "c.detastes",

diff --git a/src/main/java/com/dlsc/jfxcentral/data/model/Member.java b/src/main/java/com/dlsc/jfxcentral/data/model/Member.java
@@ -9,6 +9,7 @@ public class Member extends ModelObject {
     private String twitter;
     private String gitHub;
     private String mastodon;
+    private String bluesky;
     private boolean champion;
     private boolean rockstar;
 
@@ -71,6 +72,14 @@ public void setMastodon(String mastodon) {
         this.mastodon = mastodon;
     }
 
+    public String getBluesky() {
+        return bluesky;
+    }
+
+    public void setBluesky(String bluesky) {
+        this.bluesky = bluesky;
+    }
+
     public boolean isChampion() {
         return champion;
     }

diff --git a/src/main/java/com/dlsc/jfxcentral/data/model/Person.java b/src/main/java/com/dlsc/jfxcentral/data/model/Person.java
@@ -13,6 +13,7 @@ public class Person extends ModelObject {
     private String twitter;
     private String gitHub;
     private String mastodon;
+    private String bluesky;
     private boolean champion;
     private boolean rockstar;
 
@@ -92,6 +93,14 @@ public void setMastodon(String mastodon) {
         this.mastodon = mastodon;
     }
 
+    public String getBluesky() {
+        return bluesky;
+    }
+
+    public void setBluesky(String bluesky) {
+        this.bluesky = bluesky;
+    }
+
     public boolean isChampion() {
         return champion;
     }

diff --git a/src/test/java/com/dlsc/jfxcentral/data/DataRepositoryTest.java b/src/test/java/com/dlsc/jfxcentral/data/DataRepositoryTest.java
@@ -11,6 +11,7 @@
 import com.dlsc.jfxcentral.data.model.LearnRaspberryPi;
 import com.dlsc.jfxcentral.data.model.Library;
 import com.dlsc.jfxcentral.data.model.LibraryInfo;
+import com.dlsc.jfxcentral.data.model.Member;
 import com.dlsc.jfxcentral.data.model.Person;
 import com.dlsc.jfxcentral.data.model.Post;
 import com.dlsc.jfxcentral.data.model.RealWorldApp;
@@ -239,6 +240,23 @@ public void shouldLoadPersonMastodon() {
         assertEquals("https://foojay.social/@frankdelporte", fd.get().getMastodon(), "mastodon link not loaded");
     }
 
+    @Test
+    public void shouldLoadPersonBluesky() {
+        // given
+        DataRepository repository = DataRepository.getInstance();
+        repository.reload();
+
+        assertFalse(repository.getPeople().isEmpty());
+
+        // when
+        Optional<Person> fd = repository.getPeople().stream()
+                .filter(p -> p.getId().equals("f.delporte"))
+                .findFirst();
+
+        assertTrue(fd.isPresent());
+        assertEquals("frankdelporte.bsky.social", fd.get().getBluesky(), "bluesky link not loaded");
+    }
+
     @Test
     public void shouldLoadMemberDescription() {
         // given
@@ -256,6 +274,40 @@ public void shouldLoadMemberDescription() {
         });
     }
 
+    @Test
+    public void shouldLoadMemberMastodon() {
+        // given
+        DataRepository repository = DataRepository.getInstance();
+        repository.reload();
+
+        assertFalse(repository.getMembers().isEmpty());
+
+        // when
+        Optional<Member> fd = repository.getMembers().stream()
+                .filter(m -> m.getId().equals("f.delporte"))
+                .findFirst();
+
+        assertTrue(fd.isPresent());
+        assertEquals("https://foojay.social/@frankdelporte", fd.get().getMastodon(), "mastodon link not loaded");
+    }
+
+    @Test
+    public void shouldLoadMemberBluesky() {
+        // given
+        DataRepository repository = DataRepository.getInstance();
+        repository.reload();
+
+        assertFalse(repository.getMembers().isEmpty());
+
+        // when
+        Optional<Member> fd = repository.getMembers().stream()
+                .filter(m -> m.getId().equals("f.delporte"))
+                .findFirst();
+
+        assertTrue(fd.isPresent());
+        assertEquals("frankdelporte.bsky.social", fd.get().getBluesky(), "bluesky link not loaded");
+    }
+
     @Test
     public void shouldLoadLinksOfTheWeek() {
         // given