Skip to content

Commit 40db7a9

Browse files
committed
fix: comments
1 parent fe9e382 commit 40db7a9

File tree

5 files changed

+27
-22
lines changed

5 files changed

+27
-22
lines changed

server/application-server/src/main/java/de/tum/cit/aet/helios/releaseinfo/ReleaseInfoController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public class ReleaseInfoController {
2222
private final ReleaseInfoService releaseInfoService;
2323

2424
@GetMapping
25-
public ResponseEntity<List<ReleaseInfoListDto>> getAllReleaseCandidates() {
26-
return ResponseEntity.ok(releaseInfoService.getAllReleaseCandidates());
25+
public ResponseEntity<List<ReleaseInfoListDto>> getAllReleaseInfos() {
26+
return ResponseEntity.ok(releaseInfoService.getAllReleaseInfos());
2727
}
2828

2929
@GetMapping("/{name}")

server/application-server/src/main/java/de/tum/cit/aet/helios/releaseinfo/ReleaseInfoService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class ReleaseInfoService {
6262
private final GitHubDataSyncOrchestrator gitHubDataSyncOrchestrator;
6363
private final GitHubReleaseSyncService gitHubReleaseSyncService;
6464

65-
public List<ReleaseInfoListDto> getAllReleaseCandidates() {
65+
public List<ReleaseInfoListDto> getAllReleaseInfos() {
6666
return releaseCandidateRepository.findAllByOrderByNameAsc().stream()
6767
.map(ReleaseInfoListDto::fromReleaseCandidate)
6868
.toList();

server/application-server/src/main/java/de/tum/cit/aet/helios/releaseinfo/release/Release.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class Release extends BaseGitServiceEntity {
2525
@Column(name = "name")
2626
private String name;
2727

28-
@Column(name = "tag_name", unique = true)
28+
@Column(name = "tag_name")
2929
private String tagName;
3030

3131
@Column(columnDefinition = "TEXT")

server/application-server/src/main/java/de/tum/cit/aet/helios/releaseinfo/release/github/GitHubReleaseMessageHandler.java

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,50 @@
22

33
import de.tum.cit.aet.helios.github.GitHubMessageHandler;
44
import de.tum.cit.aet.helios.gitrepo.github.GitHubRepositorySyncService;
5+
import de.tum.cit.aet.helios.releaseinfo.release.ReleaseRepository;
6+
import lombok.RequiredArgsConstructor;
57
import lombok.extern.log4j.Log4j2;
68
import org.kohsuke.github.GHEvent;
79
import org.kohsuke.github.GHEventPayload;
10+
import org.kohsuke.github.GHEventPayload.Release;
811
import org.springframework.stereotype.Component;
912

1013
@Component
1114
@Log4j2
15+
@RequiredArgsConstructor
1216
public class GitHubReleaseMessageHandler extends GitHubMessageHandler<GHEventPayload.Release> {
1317

1418
private final GitHubReleaseSyncService releaseSyncService;
1519
private final GitHubRepositorySyncService repositorySyncService;
16-
17-
private GitHubReleaseMessageHandler(
18-
GitHubReleaseSyncService releaseSyncService,
19-
GitHubRepositorySyncService repositorySyncService) {
20-
super(GHEventPayload.Release.class);
21-
this.releaseSyncService = releaseSyncService;
22-
this.repositorySyncService = repositorySyncService;
23-
}
20+
private final ReleaseRepository releaseRepository;
2421

2522
@Override
26-
protected void handleEvent(GHEventPayload.Release eventPayload) {
27-
if (eventPayload.getAction().equals("created")) {
28-
return;
29-
}
23+
protected void handleInstalledRepositoryEvent(GHEventPayload.Release eventPayload) {
3024
log.info(
3125
"Received release event for repository: {}, release: {}, action: {}",
3226
eventPayload.getRepository().getFullName(),
3327
eventPayload.getRelease().getName(),
3428
eventPayload.getAction());
35-
repositorySyncService.processRepository(eventPayload.getRepository());
36-
// We don't need to handle the deleted action here, as pull requests are not deleted
37-
releaseSyncService.processRelease(eventPayload.getRelease());
29+
if (eventPayload.getAction().equals("created")
30+
|| eventPayload.getAction().equals("edited")
31+
|| eventPayload.getAction().equals("published")) {
32+
if (eventPayload.getRelease().isDraft()) {
33+
return;
34+
}
35+
repositorySyncService.processRepository(eventPayload.getRepository());
36+
releaseSyncService.processRelease(eventPayload.getRelease());
37+
} else if (eventPayload.getAction().equals("deleted")) {
38+
releaseRepository.deleteById(eventPayload.getRelease().getId());
39+
}
40+
}
41+
42+
@Override
43+
protected Class<Release> getPayloadClass() {
44+
return GHEventPayload.Release.class;
3845
}
3946

4047
@Override
41-
protected GHEvent getHandlerEvent() {
48+
protected GHEvent getPayloadType() {
4249
return GHEvent.RELEASE;
4350
}
4451
}

server/application-server/src/main/resources/db/migration/V18__add_ghrelease.sql renamed to server/application-server/src/main/resources/db/migration/V19__add_ghrelease.sql

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ alter table if exists public.release add constraint UKroicl6ap0hedm08ivbpvj4bji
2828
alter table if exists public.release
2929
drop constraint if exists UK5ksyl3m7jp7dmsd6bcutkv7s;
3030

31-
alter table if exists public.release add constraint UK5ksyl3m7jp7dmsd6bcutkv7s unique (tag_name);
32-
3331
alter table if exists public.release add constraint FK3ikmsdlts7wm4wa8p1nc793f5 foreign key (repository_id) references repository;
3432

3533
alter table if exists public.release

0 commit comments

Comments
 (0)