Merge pull request #78 from Staketab/dev

add domainId for activities endpoints

Author: MrFoxogen

src/main/java/com/staketab/minanames/dto/ActivityDTO.java

@@ -8,6 +8,7 @@
 public class ActivityDTO {
 
     private String id;
+    private String domainId;
     private String domainName;
     private String ownerAddress;
     private String transaction;

src/main/java/com/staketab/minanames/repository/ActivityRepository.java

@@ -2,6 +2,7 @@
 
 import com.staketab.minanames.entity.ActivityEntity;
 import com.staketab.minanames.entity.DomainEntity;
+import com.staketab.minanames.repository.projection.ActivityProjection;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -13,15 +14,29 @@ public interface ActivityRepository extends JpaRepository<ActivityEntity, String
 
     @Query(nativeQuery = true,
             value = """
-                    select *
-                      from activity
-                      where owner_address = :address and is_show is true""")
-    Page<ActivityEntity> findAllActivities(Pageable buildPageable, String address);
+                    select a.id as id,
+                           a.details as details,
+                           a.domain_name as domainName,
+                           a.owner_address as ownerAddress,
+                           a.timestamp as timestamp,
+                           a.tx_hash as txHash,
+                           a.status as status,
+                           d.id as domainId
+                      from activity a left join domains d on d.name = a.domain_name
+                      where a.owner_address = :address and a.is_show is true""")
+    Page<ActivityProjection> findAllActivities(Pageable buildPageable, String address);
 
     @Query(nativeQuery = true,
             value = """
-                    select *
-                      from activity
-                      where domain_name = :domainName and is_show is true""")
-    Page<ActivityEntity> findAllActivitiesByDomainName(Pageable buildPageable, String domainName);
+                    select a.id as id,
+                           a.details as details,
+                           a.domain_name as domainName,
+                           a.owner_address as ownerAddress,
+                           a.timestamp as timestamp,
+                           a.tx_hash as txHash,
+                           a.status as status,
+                           d.id as domainId
+                      from activity a left join domains d on d.name = a.domain_name
+                      where a.domain_name = :domainName and a.is_show is true""")
+    Page<ActivityProjection> findAllActivitiesByDomainName(Pageable buildPageable, String domainName);
 }

src/main/java/com/staketab/minanames/repository/projection/ActivityProjection.java

@@ -0,0 +1,20 @@
+package com.staketab.minanames.repository.projection;
+
+public interface ActivityProjection {
+
+    String getId();
+
+    String getDetails();
+
+    String getDomainName();
+
+    String getOwnerAddress();
+
+    Long getTimestamp();
+
+    String getTxHash();
+
+    String getStatus();
+
+    String getDomainId();
+}

src/main/java/com/staketab/minanames/service/impl/ActivityServiceImpl.java

@@ -6,6 +6,7 @@
 import com.staketab.minanames.entity.ActivityStatus;
 import com.staketab.minanames.entity.DomainEntity;
 import com.staketab.minanames.repository.ActivityRepository;
+import com.staketab.minanames.repository.projection.ActivityProjection;
 import com.staketab.minanames.service.ActivityService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -64,15 +65,16 @@ private ActivityEntity buildActivityEntity(DomainEntity domainEntity, ActivitySt
                 .build();
     }
 
-    private ActivityDTO buildActivityDTO(ActivityEntity activityEntity) {
+    private ActivityDTO buildActivityDTO(ActivityProjection activityProjection) {
         return ActivityDTO.builder()
-                .id(activityEntity.getId())
-                .activity(ActivityStatus.valueOf(activityEntity.getStatus()).getMessage())
-                .transaction(activityEntity.getTxHash())
-                .details(activityEntity.getDetails())
-                .timestamp(activityEntity.getTimestamp())
-                .ownerAddress(activityEntity.getOwnerAddress())
-                .domainName(activityEntity.getDomainName())
+                .id(activityProjection.getId())
+                .activity(ActivityStatus.valueOf(activityProjection.getStatus()).getMessage())
+                .transaction(activityProjection.getTxHash())
+                .details(activityProjection.getDetails())
+                .timestamp(activityProjection.getTimestamp())
+                .ownerAddress(activityProjection.getOwnerAddress())
+                .domainName(activityProjection.getDomainName())
+                .domainId(activityProjection.getDomainId())
                 .build();
     }
 }