added inbox, actors, external repositories, and conversations. #118

seannian · 2023-08-10T03:42:28Z

added the "Create" function of the Inbox and the skeleton of the others (someone please check if i created the statuses correctly)
added actors and a method to convert actors into accounts (please check if i created the accounts correctly)
added external repositories for external actors and statuses
added the framework for conversations

…ions

breed

i'm super excited to get this in. just a few structural changes.

breed · 2023-08-10T14:29:46Z

server/src/main/java/edu/sjsu/moth/server/controller/InboxController.java

@@ -45,13 +55,115 @@ public class InboxController {
    @Autowired
    AccountRepository accountRepository;

+    @Autowired


from now on we shouldn't wire repositories to controllers. create a service. that way we separate presentation and service logic.

breed · 2023-08-10T14:31:45Z

server/src/main/java/edu/sjsu/moth/server/controller/InboxController.java

    //required to map payload from JSON to a Java Object for data access
    ObjectMapper mappedLoad;

    public InboxController(ObjectMapper mappedLoad) {
        this.mappedLoad = mappedLoad;
    }

+    //Print method, testing purposes
+    public static void printJsonNode(JsonNode node, String indent) {


this should go in the Util class. it is generally useful.

breed · 2023-08-10T14:32:11Z

server/src/main/java/edu/sjsu/moth/server/controller/InboxController.java

+    @PostMapping("/inbox")
+    public Mono<String> inbox(@RequestBody JsonNode inboxNode) {
+        //print out what it gives
+        System.out.println("\nSTART####################################################################\n");


don't checkin debug statements unless you use log.debug()

breed · 2023-08-10T14:34:07Z

server/src/main/java/edu/sjsu/moth/server/controller/InboxController.java

+        String toLink = objNode.get("id").asText();
+
+        //putting in variables for now to make it easier to read
+        String accountName = node.get("actor")


i don't think you use this do you?

breed · 2023-08-10T14:38:06Z

server/src/main/java/edu/sjsu/moth/server/controller/InboxController.java

+
+        //Making an actor and then converting to account
+        String accountLink = node.get("actor").asText();
+        if (externalActorRepository.findItemById(accountLink) != null) {


this will always be true. the mono returned by findItemById will either be empty or have the account, so you should first do a switchIfEmpty to create the account and then you can have common logic for adding the status.

breed · 2023-08-10T14:39:11Z

server/src/main/java/edu/sjsu/moth/server/controller/InboxController.java

+        //Making an actor and then converting to account
+        String accountLink = node.get("actor").asText();
+        if (externalActorRepository.findItemById(accountLink) != null) {
+            externalActorRepository.findItemById(accountLink).flatMap(Actor::convertToAccount).subscribe(account -> {


do a map rather than subscribe. subscribe will block. then return the mono from the map

breed · 2023-08-10T14:39:32Z

server/src/main/java/edu/sjsu/moth/server/controller/InboxController.java

+                externalStatusRepository.save(status);
+            });
+        }
+        return Mono.empty();


this should be the mono from the externalStatusRepository.save()

breed · 2023-08-10T14:42:17Z

server/src/main/java/edu/sjsu/moth/server/controller/InboxController.java

@@ -65,7 +177,7 @@ public Mono<String> followerHandler(String id, JsonNode inboxNode, String reques
        String follower = inboxNode.get("actor").asText();
        if (requestType.equals("Follow")) {
            // check id
-            if (accountRepository.findItemByAcct(id)==null) {
+            if (accountRepository.findItemByAcct(id) == null) {


i know this isn't your code, but this is wrong to. it should be no if just:

return accountRepository.findItemByAccount(id).swithIfEmpty(Mono.error(new RuntimeException ....)
.then(followersRepository.findItem ...

breed · 2023-08-10T14:43:05Z

server/src/main/java/edu/sjsu/moth/server/db/Actor.java

@@ -0,0 +1,148 @@
+package edu.sjsu.moth.server.db;


you should generate these classes with json2java. the then create a simple class in db with the class as a member

this should be deleted since we have the generated actor now. right?

…us and ExternalStatusRepository, added services changes to InboxController, new Services, new Util

…ions

…tps://github.com/SJSU-CS-systems-group/moth into inbox-actors-external-repositories-conversations

breed · 2023-08-31T06:02:42Z

server/src/main/java/edu/sjsu/moth/server/controller/InboxController.java

@@ -65,24 +183,24 @@ public Mono<String> followerHandler(String id, JsonNode inboxNode, String reques
        String follower = inboxNode.get("actor").asText();
        if (requestType.equals("Follow")) {
            // check id
-            if (accountRepository.findItemByAcct(id)==null) {
+            if (accountService.getAccount(id) == null) {


this isn't related to the change, but we really need to fix this. this check will always be true, and we aren't connecting the mono to the next one, so we never actually check the account...

breed · 2023-08-31T06:03:18Z

server/src/main/java/edu/sjsu/moth/server/db/Actor.java

@@ -0,0 +1,148 @@
+package edu.sjsu.moth.server.db;


this should be deleted since we have the generated actor now. right?

breed · 2023-08-31T06:05:50Z

server/src/main/java/edu/sjsu/moth/server/db/Conversation.java

+public class Conversation {
+    //https://docs.joinmastodon.org/entities/Conversation/
+    public String id;
+    public boolean unread;


i don't think a boolean is correct here. i think this should be a list of accounts who have read it. we probably want the account ids, not the full account record.

note, this means what we store in the database and the conversation response format will be different.

i used a hashmap with <String, Boolean> that maps to <accountId, read>, would that work or should we just have an arraylist of accounts?

breed · 2023-08-31T06:06:08Z

server/src/main/java/edu/sjsu/moth/server/db/Conversation.java

+    //https://docs.joinmastodon.org/entities/Conversation/
+    public String id;
+    public boolean unread;
+    public List<Account> accounts;


i think we should just use the account ids here too.

breed · 2023-08-31T06:07:19Z

server/src/main/java/edu/sjsu/moth/server/db/Conversation.java

+    public String id;
+    public boolean unread;
+    public List<Account> accounts;
+    public Status lastStatus;


i think this should also be a status id because we will have the status in the status table right?

…ions

seannian and others added 2 commits August 9, 2023 20:35

added inbox, actors, external repositories, and conversations.

8b4fbdf

Merge branch 'main' into inbox-actors-external-repositories-conversat…

fabe9fa

…ions

breed requested changes Aug 10, 2023

View reviewed changes

seannian and others added 4 commits August 30, 2023 21:04

Added Actor and Actor Properties with JSON2JAVA, Created ExternalStat…

6e9422c

…us and ExternalStatusRepository, added services changes to InboxController, new Services, new Util

Merge branch 'main' into inbox-actors-external-repositories-conversat…

7040c09

…ions

got rid of some testing print lines

2fd5094

Merge branch 'inbox-actors-external-repositories-conversations' of ht…

c3a683b

…tps://github.com/SJSU-CS-systems-group/moth into inbox-actors-external-repositories-conversations

breed requested changes Aug 31, 2023

View reviewed changes

fixed follower handler and changed conversation properties

0da9b78

breed approved these changes Sep 5, 2023

View reviewed changes

Merge branch 'main' into inbox-actors-external-repositories-conversat…

692b5ba

…ions

seannian merged commit 2de391d into main Sep 5, 2023
1 check passed

seannian deleted the inbox-actors-external-repositories-conversations branch September 5, 2023 23:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

added inbox, actors, external repositories, and conversations. #118

added inbox, actors, external repositories, and conversations. #118

seannian commented Aug 10, 2023

breed left a comment

breed Aug 10, 2023

breed Aug 10, 2023

breed Aug 10, 2023

breed Aug 10, 2023

breed Aug 10, 2023

breed Aug 10, 2023

breed Aug 10, 2023

breed Aug 10, 2023

breed Aug 10, 2023

breed Aug 31, 2023

breed Aug 31, 2023

breed Aug 31, 2023

breed Aug 31, 2023

seannian Sep 1, 2023

breed Aug 31, 2023

breed Aug 31, 2023

added inbox, actors, external repositories, and conversations. #118

added inbox, actors, external repositories, and conversations. #118

Conversation

seannian commented Aug 10, 2023

breed left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment