feature(nats): add nats messaging

build.gradle

@@ -29,6 +29,7 @@ dependencies {
     implementation 'org.mapstruct:mapstruct:1.6.3'
     implementation "org.projectlombok:lombok-mapstruct-binding:0.2.0"
     implementation 'org.flywaydb:flyway-database-postgresql'
+    implementation 'io.nats:jnats:2.24.1'
 
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'

compose.dev.yml

@@ -16,6 +16,7 @@ services:
       - "${SERVER_PORT:-9090}:${SERVER_PORT:-9090}"
     depends_on:
       - db-dev
+      - nats-dev
     healthcheck:
       test: ["CMD", "wget", "-qO-", "http://localhost:${SERVER_PORT:-9090}/actuator/health"]
       interval: 10s
@@ -39,6 +40,15 @@ services:
     networks:
       - heapdog-network-dev
 
+  nats-dev:
+    container_name: nats-dev
+    image: nats:2.12.2-alpine3.22
+    ports:
+      - "4223:4222"
+      - "8223:8222"
+    networks:
+      - heapdog-network-dev
+
 volumes:
   db_data_dev:
 

compose.yml

@@ -63,18 +63,14 @@ services:
     networks:
       - heapdog-network
 
-
-  test:
-    build:
-      context: .
-      dockerfile: Dockerfile.test
-    working_dir: /home/gradle/app
-    environment:
-      SPRING_PROFILES_ACTIVE: test
-    volumes:
-      - .:/home/gradle/app
-      - ./build/reports:/home/gradle/app/build/reports
-    command: [ "./gradlew", "test", "jacocoTestReport", "--info" ]
+  nats:
+    container_name: nats
+    image: nats:2.12.2-alpine3.22
+    ports:
+      - "4222:4222"
+      - "8222:8222"
+    networks:
+      - heapdog-network
 
 volumes:
   db_data_prod:

src/main/java/io/heapdog/core/config/NatsConfig.java

@@ -0,0 +1,23 @@
+package io.heapdog.core.config;
+
+
+import io.nats.client.Connection;
+import io.nats.client.Nats;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.io.IOException;
+
+@Configuration
+public class NatsConfig {
+
+    @Value("${nats.url}")
+    private String natsUrl;
+
+    @Bean(destroyMethod = "close")
+    public Connection natsConnection() throws IOException, InterruptedException {
+        return Nats.connect(natsUrl);
+    }
+
+}

src/main/java/io/heapdog/core/feature/notification/InternalNotificationController.java

@@ -0,0 +1,23 @@
+package io.heapdog.core.feature.notification;
+
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/internal/notifications")
+@RequiredArgsConstructor
+public class InternalNotificationController {
+
+    private final NotificationService notificationService;
+
+    @GetMapping("/{id}")
+    InternalNotificationResponseDto
+    getNotifications(@PathVariable Long id) {
+        return notificationService.getNotificationById(id);
+    }
+
+}

src/main/java/io/heapdog/core/feature/notification/InternalNotificationResponseDto.java

@@ -0,0 +1,22 @@
+package io.heapdog.core.feature.notification;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.Instant;
+
+
+@Getter
+@Setter
+@Builder
+public class InternalNotificationResponseDto {
+    private Long id;
+    private String message;
+    private String link;
+    private boolean read;
+    private boolean clicked;
+    private NotificationType type;
+    private Instant createdAt;
+    private Long userId;
+}

src/main/java/io/heapdog/core/feature/notification/NotificationService.java

@@ -6,6 +6,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -26,6 +27,22 @@ public Notification createNotification(String message, String link) {
         return notificationRepository.save(notification);
     }
 
+    @PreAuthorize("hasAuthority('read:notification')")
+    InternalNotificationResponseDto getNotificationById(Long notificationId) {
+        Notification notification = notificationRepository.findById(notificationId)
+                .orElseThrow(() -> new ResourceNotFoundException("Notification", "id", notificationId.toString()));
+        return InternalNotificationResponseDto.builder()
+                .id(notification.getId())
+                .message(notification.getMessage())
+                .link(notification.getLink())
+                .read(notification.isRead())
+                .clicked(notification.isClicked())
+                .type(notification.getType())
+                .createdAt(notification.getCreatedAt())
+                .userId(notification.getRecipient().getId())
+                .build();
+    }
+
     Page<NotificationResponseDto>
     getNotifications(Long userId, Long page, Long size) {
         return notificationRepository.findByRecipientId(

src/main/java/io/heapdog/core/feature/notification/NotificationType.java

@@ -2,6 +2,8 @@
 
 public enum NotificationType {
 
-    INVITATION
+    INVITATION_SENT,
+    INVITATION_ACCEPTED,
+    ORGANIZATION_MEMBER_ROLE_UPDATED, ORGANIZATION_UPDATED,
 
 }

src/main/java/io/heapdog/core/feature/organization/MembershipRepository.java

@@ -5,6 +5,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface MembershipRepository extends JpaRepository<Membership, Long> {
@@ -24,7 +25,8 @@ public interface MembershipRepository extends JpaRepository<Membership, Long> {
                     m.user.id,
                     m.user.username,
                     m.user.email,
-                    m.role
+                    m.role,
+                    m.id
                 )
                 FROM Membership m
                 WHERE m.organization.id = :organizationId
@@ -33,4 +35,11 @@ SELECT COUNT(m) FROM Membership m
                 WHERE m.organization.id = :organizationId
             """)
     Page<OrganizationMemberResponseDto> findByOrganizationId(Long organizationId, Pageable pageable);
+
+    @Query("""
+                SELECT m FROM Membership m
+                JOIN FETCH m.organization
+                WHERE m.organization.id = :organizationId
+""")
+    List<Membership> findByOrganizationId(Long organizationId);
 }

src/main/java/io/heapdog/core/feature/organization/OrganizationBasicInfoUpdateRequestDto.java

@@ -12,8 +12,6 @@ public class OrganizationBasicInfoUpdateRequestDto {
 
     private String name;
 
-    private String slug;
-
     @Size(max = 100, message = "Description can be at most 100 characters")
     private String description;
 

src/main/java/io/heapdog/core/feature/organization/OrganizationController.java

@@ -107,4 +107,12 @@ OrganizationInvitationAcceptResponseDto acceptInvitation(@PathVariable String sl
         return organizationService.acceptInvitation(slug, dto, user.getId());
     }
 
+    @PreAuthorize("@organizationSecurity.isAdmin(#slug, authentication)")
+    @PatchMapping("/{slug}/membership/{membershipId}/role")
+    OrganizationMemberResponseDto updateOrganizationMemberRole(@PathVariable String slug,
+                                                             @PathVariable Long membershipId,
+                                                             @Valid @RequestBody OrganizationMemberRoleUpdateRequestDto dto) {
+        return organizationService.updateOrganizationMemberRole(slug, membershipId, dto);
+    }
+
 }

src/main/java/io/heapdog/core/feature/organization/OrganizationMemberResponseDto.java

@@ -10,4 +10,5 @@ public class OrganizationMemberResponseDto {
     private String username;
     private String email;
     private OrganizationRole role;
+    private Long membershipId;
 }

src/main/java/io/heapdog/core/feature/organization/OrganizationMemberRoleUpdateRequestDto.java

@@ -0,0 +1,13 @@
+package io.heapdog.core.feature.organization;
+
+
+import lombok.Builder;
+import lombok.Data;
+
+@Builder
+@Data
+public class OrganizationMemberRoleUpdateRequestDto {
+
+    private OrganizationRole role;
+
+}