From 04b54b076b9e506aeb1026647542ef3df158909b Mon Sep 17 00:00:00 2001 From: shhhushhh Date: Fri, 1 Sep 2023 12:25:12 -0700 Subject: [PATCH] Removed null if/else and combined error msg --- .../moth/server/service/AccountService.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/server/src/main/java/edu/sjsu/moth/server/service/AccountService.java b/server/src/main/java/edu/sjsu/moth/server/service/AccountService.java index b886b00f..677852e8 100644 --- a/server/src/main/java/edu/sjsu/moth/server/service/AccountService.java +++ b/server/src/main/java/edu/sjsu/moth/server/service/AccountService.java @@ -90,19 +90,15 @@ public Mono getPublicKey(String id, boolean addIfMissing) { public Mono followerHandler(String id, JsonNode inboxNode, String requestType) { String follower = inboxNode.get("actor").asText(); if (requestType.equals("Follow")) { - // check id - if (accountRepository.findItemByAcct(id)==null) { - return Mono.error(new RuntimeException("Error: Account to follow doesn't exist.")); - } // find id, grab arraylist, append - else { - return followersRepository.findItemById(id) - .switchIfEmpty(Mono.just(new Followers(id, new ArrayList<>()))) - .flatMap(followedUser -> { - followedUser.getFollowers().add(follower); - return followersRepository.save(followedUser).thenReturn("done"); - }); - } + return accountRepository.findItemByAcct(id) + .switchIfEmpty(Mono.error(new RuntimeException("Error: Account to follow does not exist"))) + .then(followersRepository.findItemById(id) + .switchIfEmpty(Mono.just(new Followers(id, new ArrayList<>()))) + .flatMap(followedUser -> { + followedUser.getFollowers().add(follower); + return followersRepository.save(followedUser).thenReturn("done"); + })); } if (requestType.equals("Undo")) { // find id, grab arraylist, remove