#119 Native Sublinks API

src/main/java/com/sublinks/sublinksapi/api/sublinks/v1/community/services/SublinksCommunityService.java

@@ -4,6 +4,7 @@
 import com.sublinks.sublinksapi.api.sublinks.v1.community.models.CreateCommunity;
 import com.sublinks.sublinksapi.api.sublinks.v1.community.models.UpdateCommunity;
 import com.sublinks.sublinksapi.api.sublinks.v1.utils.ActorIdUtils;
+import com.sublinks.sublinksapi.authorization.enums.RolePermission;
 import com.sublinks.sublinksapi.authorization.services.RoleAuthorizingService;
 import com.sublinks.sublinksapi.community.entities.Community;
 import com.sublinks.sublinksapi.community.repositories.CommunityRepository;
@@ -12,6 +13,7 @@
 import com.sublinks.sublinksapi.instance.repositories.InstanceRepository;
 import com.sublinks.sublinksapi.person.entities.Person;
 import com.sublinks.sublinksapi.person.services.LinkPersonCommunityService;
+import java.util.Optional;
 import lombok.AllArgsConstructor;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.http.HttpStatus;
@@ -30,12 +32,16 @@ public class SublinksCommunityService {
 
   public CommunityResponse createCommunity(CreateCommunity createCommunity, Person person) {
 
-    final Community oldCommunity = communityRepository.findCommunityByTitleSlug(
+    final Optional<Community> oldCommunity = communityRepository.findCommunityByTitleSlug(
         createCommunity.titleSlug());
-    if (oldCommunity != null) {
+    if (oldCommunity.isPresent()) {
       throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "community_slug_already_exist");
     }
 
+    if (roleAuthorizingService.hasAdminOrPermission(person, RolePermission.CREATE_COMMUNITY)) {
+      throw new ResponseStatusException(HttpStatus.FORBIDDEN, "not_authorized_to_create_community");
+    }
+
     Community community = Community.builder()
         .title(createCommunity.title())
         .titleSlug(createCommunity.titleSlug())
@@ -54,24 +60,21 @@ public CommunityResponse createCommunity(CreateCommunity createCommunity, Person
   public CommunityResponse updateCommunity(String key, UpdateCommunity updateCommunityForm,
       Person person) {
 
+    String domain = ActorIdUtils.getActorDomain(key);
+    if (domain != null && domain.equals(localInstanceContext.instance().getDomain())) {
+      key = ActorIdUtils.getActorId(key);
+    }
+    Optional<Community> foundCommunity = communityRepository.findCommunityByTitleSlug(key);
 
-
-    Community community;
-    try {
-      String domain = ActorIdUtils.getActorDomain(key);
-      if (domain != null && domain.equals(localInstanceContext.instance().getDomain())) {
-        key = ActorIdUtils.getActorId(key);
-      }
-      community = communityRepository.findCommunityByTitleSlug(key);
-    } catch (Exception e) {
+    if (foundCommunity.isEmpty()) {
       throw new ResponseStatusException(HttpStatus.NOT_FOUND, "community_not_found");
     }
 
-    if(!roleAuthorizingService.isModeratorOrAdmin(person, community)) {
+    Community community = foundCommunity.get();
+    if (!roleAuthorizingService.isModeratorOrAdmin(person, community)) {
       throw new ResponseStatusException(HttpStatus.FORBIDDEN, "not_authorized_to_update_community");
     }
 
-
     final Boolean isDeleted = updateCommunityForm.deleted().orElse(null);
 
     if (isDeleted != null && isDeleted != community.isDeleted()) {

src/main/java/com/sublinks/sublinksapi/community/repositories/CommunityRepository.java

@@ -3,6 +3,7 @@
 import com.sublinks.sublinksapi.community.entities.Community;
 import com.sublinks.sublinksapi.instance.entities.Instance;
 import java.util.List;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface CommunityRepository extends JpaRepository<Community, Long>,
@@ -12,7 +13,7 @@ public interface CommunityRepository extends JpaRepository<Community, Long>,
 
   Community findCommunityByIsLocalTrueAndTitleSlug(String titleSlug);
 
-  Community findCommunityByTitleSlug(String titleSlug);
+  Optional<Community> findCommunityByTitleSlug(String titleSlug);
 
   List<Community> findCommunitiesByInstance(Instance instance);