Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void initGroup() {
}
}

@Scheduled(fixedDelay = 300000)
@Scheduled(fixedDelay = 10000)
public void consumeMessages() {
List<MapRecord<String, Object, Object>> messages =
redisTemplate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void initGroup() {
}
}

@Scheduled(fixedDelay = 300000)
@Scheduled(fixedDelay = 10000)
public void consumeMessages() {
List<MapRecord<String, Object, Object>> messages =
redisTemplate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void createGroup() {
}
}

@Scheduled(fixedDelay = 300000)
@Scheduled(fixedDelay = 10000)
public void consume() {
List<MapRecord<String, Object, Object>> records =
redisTemplate
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
package com.doubleo.logservice.domain.log.dto.request;

import com.doubleo.logservice.global.enums.VisitCategory;

public record CreateAreaEnterLogRequest(
String tenantId, Long areaId, Long memberId, String memberName, Long passId) {}
String tenantId,
Long areaId,
Long memberId,
String memberName,
Long passId,
VisitCategory visitCategory) {}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public void sendAreaEnterLogToStream(CreateAreaEnterLogRequest request) {
message.put("memberId", request.memberId().toString());
message.put("memberName", request.memberName());
message.put("passId", request.passId().toString());
message.put("visitCategory", request.visitCategory().name());
message.put("timestamp", LocalDateTime.now().toString());

redisTemplate.opsForStream().add("area:enter:stream", message);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.doubleo.logservice.grpc.server;

import com.doubleo.logservice.domain.log.domain.*;
import com.doubleo.logservice.domain.log.producer.AreaEnterLogStreamProducer;
import com.doubleo.logservice.domain.log.producer.BuildingEnterLogStreamProducer;
import com.doubleo.logservice.domain.log.repository.BuildingEnterLogRepository;
import com.doubleo.logservice.domain.log.repository.EnterLogRepository;
import com.doubleo.logservice.domain.log.repository.IssuedLogAreaRepository;
Expand All @@ -18,16 +20,23 @@ public class LogGrpcServiceImpl extends LogServiceGrpc.LogServiceImplBase {
private final IssuedLogAreaRepository issuedLogAreaRepository;
private final EnterLogRepository enterLogRepository;
private final BuildingEnterLogRepository buildingEnterLogRepository;
private final AreaEnterLogStreamProducer areaEnterLogProducer;
private final BuildingEnterLogStreamProducer buildingEnterLogProducer;

public LogGrpcServiceImpl(
IssuedLogRepository issuedLogRepository,
IssuedLogAreaRepository issuedLogAreaRepository,
EnterLogRepository enterLogRepository,
BuildingEnterLogRepository buildingEnterLogRepository) {
BuildingEnterLogRepository buildingEnterLogRepository,
AreaEnterLogStreamProducer areaProducer,
BuildingEnterLogStreamProducer buildingEnterLogProducer) {
this.issuedLogRepository = issuedLogRepository;
this.issuedLogAreaRepository = issuedLogAreaRepository;
this.enterLogRepository = enterLogRepository;
this.buildingEnterLogRepository = buildingEnterLogRepository;
this.areaEnterLogProducer = areaProducer;

this.buildingEnterLogProducer = buildingEnterLogProducer;
}

@Override
Expand Down Expand Up @@ -62,38 +71,35 @@ public void createIssuedLog(
public void createEnterLog(
CreateEnterLogRequest request,
StreamObserver<CreateEnterLogResponse> responseObserver) {
EnterLog enterLog =
enterLogRepository.save(
EnterLog.createEnterLog(
request.getTenantId(),
request.getAreaId(),
request.getMemberId(),
request.getMemberName(),
request.getPassId(),
VisitCategory.valueOf(request.getVisitCategory())));
responseObserver.onNext(
CreateEnterLogResponse.newBuilder().setEnterLogId(enterLog.getId()).build());
areaEnterLogProducer.sendAreaEnterLogToStream(
new com.doubleo.logservice.domain.log.dto.request.CreateAreaEnterLogRequest(
request.getTenantId(),
request.getAreaId(),
request.getMemberId(),
request.getMemberName(),
request.getPassId(),
VisitCategory.valueOf(request.getVisitCategory())));

responseObserver.onNext(CreateEnterLogResponse.newBuilder().setEnterLogId(1L).build());
responseObserver.onCompleted();
}

@Override
public void createBuildingEnterLog(
CreateBuildingEnterLogRequest request,
StreamObserver<CreateBuildingEnterLogResponse> responseObserver) {
BuildingEnterLog buildingEnterLog =
buildingEnterLogRepository.save(
BuildingEnterLog.createBuildingEnterLog(
request.getTenantId(),
request.getBuildingId(),
request.getMemberId(),
request.getMemberName(),
request.getPassId(),
Direction.valueOf(request.getDirection()),
VisitCategory.valueOf(request.getVisitCategory())));
buildingEnterLogProducer.sendBuildingEnterLogToStream(
new com.doubleo.logservice.domain.log.dto.request.CreateBuildingEnterLogRequest(
request.getTenantId(),
request.getBuildingId(),
request.getMemberId(),
request.getMemberName(),
request.getPassId(),
Direction.valueOf(request.getDirection()),
VisitCategory.valueOf(request.getVisitCategory())));

responseObserver.onNext(
CreateBuildingEnterLogResponse.newBuilder()
.setBuildingEnterLogId(buildingEnterLog.getId())
.build());
CreateBuildingEnterLogResponse.newBuilder().setBuildingEnterLogId(1L).build());
responseObserver.onCompleted();
}
}