Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create activity endpoint for bad practice detection #224

Merged
merged 29 commits into from
Mar 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b23358d
create activity endpoint for bad practice detection(#223)
iam-flo Jan 17, 2025
3cbfc29
chore: update API specs and client
github-actions[bot] Jan 17, 2025
c186262
create activity dashboard(#199)
iam-flo Jan 17, 2025
7500d48
remove TODO comments(#223)
iam-flo Jan 22, 2025
42cbb78
rework bad practices(#223)
iam-flo Jan 28, 2025
ae497fe
update pr bad practice card(#223)
iam-flo Jan 28, 2025
98d9c8e
create db migration(#223)
iam-flo Jan 28, 2025
0c99d2a
Merge branch 'develop' into 223-creating-activity-dashboard
iam-flo Feb 19, 2025
2787e94
create activity endpoint for bad practice detection(#223)
iam-flo Jan 17, 2025
29404d2
chore: update API specs and client
github-actions[bot] Jan 17, 2025
96571ce
create activity dashboard(#199)
iam-flo Jan 17, 2025
d1a1cea
remove TODO comments(#223)
iam-flo Jan 22, 2025
cb85716
rework bad practices(#223)
iam-flo Jan 28, 2025
2c00b70
update pr bad practice card(#223)
iam-flo Jan 28, 2025
8fd4037
create db migration(#223)
iam-flo Jan 28, 2025
bb29cf2
rework after review #224
iam-flo Feb 20, 2025
083800b
Merge remote-tracking branch 'origin/223-creating-activity-dashboard'…
iam-flo Feb 20, 2025
092681a
Create detection LLM endpoint (#232)
iam-flo Mar 3, 2025
fee223b
prettier format #223
iam-flo Mar 3, 2025
de9d956
Merge remote-tracking branch 'origin/develop' into 223-creating-activ…
iam-flo Mar 3, 2025
995e0fc
update open api #223
iam-flo Mar 3, 2025
e910b21
update after merge #223
iam-flo Mar 3, 2025
0901e0b
chore: update API specs and client
github-actions[bot] Mar 3, 2025
6f01f75
update liquibase migration #223
iam-flo Mar 3, 2025
f6bd6d1
update after code rabbit #223
iam-flo Mar 3, 2025
3cc6acd
update code style #223
iam-flo Mar 3, 2025
17ad19b
chore: update API specs and client
github-actions[bot] Mar 3, 2025
e4cc110
update endpoints #223
iam-flo Mar 3, 2025
d738b85
chore: update API specs and client
github-actions[bot] Mar 3, 2025
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
128 changes: 128 additions & 0 deletions server/application-server/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,47 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/LeagueChange"
/activity/user/{login}/badpractices:
post:
tags:
- activity
operationId: detectBadPracticesByUser
parameters:
- name: login
in: path
required: true
schema:
type: string
responses:
"200":
description: OK
content:
application/json:
schema:
type: array
items:
$ref: "#/components/schemas/PullRequestBadPractice"
/activity/pullrequest/{pullRequestId}/badpractices:
post:
tags:
- activity
operationId: detectBadPracticesForPullRequest
parameters:
- name: pullRequestId
in: path
required: true
schema:
type: integer
format: int64
responses:
"200":
description: OK
content:
application/json:
schema:
type: array
items:
$ref: "#/components/schemas/PullRequestBadPractice"
/workspace/users:
get:
tags:
Expand Down Expand Up @@ -449,6 +490,24 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/Session"
/activity/{login}:
get:
tags:
- activity
operationId: getActivityByUser
parameters:
- name: login
in: path
required: true
schema:
type: string
responses:
"200":
description: OK
content:
application/json:
schema:
$ref: "#/components/schemas/Activity"
/workspace/team/{teamId}:
delete:
tags:
Expand Down Expand Up @@ -660,6 +719,57 @@ components:
- name
- teams
- url
PullRequestWithBadPractices:
type: object
properties:
id:
type: integer
format: int64
number:
type: integer
format: int32
title:
type: string
state:
type: string
enum:
- OPEN
- CLOSED
isDraft:
type: boolean
isMerged:
type: boolean
labels:
type: array
items:
$ref: "#/components/schemas/LabelInfo"
repository:
$ref: "#/components/schemas/RepositoryInfo"
additions:
type: integer
format: int32
deletions:
type: integer
format: int32
htmlUrl:
type: string
createdAt:
type: string
format: date-time
badPractices:
type: array
items:
$ref: "#/components/schemas/PullRequestBadPractice"
required:
- additions
- deletions
- htmlUrl
- id
- isDraft
- isMerged
- number
- state
- title
PullRequestBaseInfo:
type: object
properties:
Expand Down Expand Up @@ -715,6 +825,15 @@ components:
- id
- login
- name
Activity:
type: object
properties:
pullRequests:
type: array
items:
$ref: "#/components/schemas/PullRequestWithBadPractices"
required:
- pullRequests
UserInfo:
type: object
properties:
Expand Down Expand Up @@ -764,6 +883,15 @@ components:
- labels
- name
- repositories
PullRequestBadPractice:
type: object
properties:
title:
type: string
description:
type: string
resolved:
type: boolean
LeagueChange:
type: object
properties:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package de.tum.in.www1.hephaestus.activity;

import de.tum.in.www1.hephaestus.activity.model.ActivityDTO;
import de.tum.in.www1.hephaestus.activity.model.PullRequestBadPracticeDTO;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("/activity")
public class ActivityController {

@Autowired
private ActivityService activityService;

@GetMapping("/{login}")
public ResponseEntity<ActivityDTO> getActivityByUser(@PathVariable String login) {
ActivityDTO activity = activityService.getActivity(login);
return ResponseEntity.ok(activity);
}

@PostMapping("/user/{login}/badpractices")
public ResponseEntity<List<PullRequestBadPracticeDTO>> detectBadPracticesByUser(@PathVariable String login) {
List<PullRequestBadPracticeDTO> badPractices = activityService.detectBadPracticesForUser(login);
return ResponseEntity.ok(badPractices);
}

@PostMapping("/pullrequest/{pullRequestId}/badpractices")
public ResponseEntity<List<PullRequestBadPracticeDTO>> detectBadPracticesForPullRequest(
@PathVariable Long pullRequestId
) {
List<PullRequestBadPracticeDTO> badPractice = activityService.detectBadPracticesForPullRequest(pullRequestId);
return ResponseEntity.ok(badPractice);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
package de.tum.in.www1.hephaestus.activity;

import de.tum.in.www1.hephaestus.activity.badpracticedetector.PullRequestBadPracticeDetector;
import de.tum.in.www1.hephaestus.activity.model.*;
import de.tum.in.www1.hephaestus.gitprovider.issue.Issue;
import de.tum.in.www1.hephaestus.gitprovider.pullrequest.PullRequest;
import de.tum.in.www1.hephaestus.gitprovider.pullrequest.PullRequestRepository;
import de.tum.in.www1.hephaestus.gitprovider.user.UserRepository;
import jakarta.transaction.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@Service
public class ActivityService {

private static final Logger logger = LoggerFactory.getLogger(ActivityService.class);

@Autowired
private PullRequestRepository pullRequestRepository;

@Autowired
private PullRequestBadPracticeRepository pullRequestBadPracticeRepository;

@Autowired
private PullRequestBadPracticeDetector pullRequestBadPracticeDetector;

@Autowired
private UserRepository userRepository;

public ActivityDTO getActivity(String login) {
logger.info("Getting activity for user with login: {}", login);

List<PullRequest> pullRequests = pullRequestRepository.findAssignedByLoginAndStates(
login,
Set.of(Issue.State.OPEN)
);

List<PullRequestBadPractice> openPulLRequestBadPractices =
pullRequestBadPracticeRepository.findAssignedByLoginAndOpen(login);

Map<PullRequest, List<PullRequestBadPracticeDTO>> pullRequestBadPracticesMap = openPulLRequestBadPractices
.stream()
.collect(
Collectors.groupingBy(
PullRequestBadPractice::getPullrequest,
Collectors.collectingAndThen(Collectors.toList(), list ->
list.stream().map(PullRequestBadPracticeDTO::fromPullRequestBadPractice).toList()
)
)
);

List<PullRequestWithBadPracticesDTO> openPullRequestsWithBadPractices = pullRequests
.stream()
.map(pullRequest ->
PullRequestWithBadPracticesDTO.fromPullRequest(
pullRequest,
pullRequestBadPracticesMap.getOrDefault(pullRequest, List.of())
)
)
.collect(Collectors.toList());

return new ActivityDTO(openPullRequestsWithBadPractices);
}

public List<PullRequestBadPracticeDTO> detectBadPracticesForUser(String login) {
logger.info("Detecting bad practices for user with login: {}", login);

List<PullRequest> pullRequests = pullRequestRepository.findAssignedByLoginAndStates(
login,
Set.of(Issue.State.OPEN)
);

List<PullRequestBadPractice> detectedBadPractices = new ArrayList<>();
for (PullRequest pullRequest : pullRequests) {
detectedBadPractices.addAll(pullRequestBadPracticeDetector.detectAndSyncBadPractices(pullRequest));
}
return detectedBadPractices.stream().map(PullRequestBadPracticeDTO::fromPullRequestBadPractice).toList();
}

public List<PullRequestBadPracticeDTO> detectBadPracticesForPullRequest(Long pullRequestId) {
logger.info("Detecting bad practices for PR: {}", pullRequestId);

PullRequest pullRequest = pullRequestRepository.findById(pullRequestId).orElse(null);
if (pullRequest == null) {
throw new IllegalArgumentException("Pull request " + pullRequestId + " not found");
}

List<PullRequestBadPractice> detectedBadPractices = pullRequestBadPracticeDetector.detectAndSyncBadPractices(
pullRequest
);
return detectedBadPractices.stream().map(PullRequestBadPracticeDTO::fromPullRequestBadPractice).toList();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package de.tum.in.www1.hephaestus.activity;

import de.tum.in.www1.hephaestus.activity.model.PullRequestBadPractice;
import jakarta.transaction.Transactional;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

@Repository
public interface PullRequestBadPracticeRepository extends JpaRepository<PullRequestBadPractice, Long> {
@Transactional
@Query(
"""
SELECT prbp
FROM PullRequestBadPractice prbp
WHERE LOWER(:assigneeLogin) IN (SELECT LOWER(u.login) FROM prbp.pullrequest.assignees u) AND prbp.pullrequest.state = 'OPEN'
"""
)
List<PullRequestBadPractice> findAssignedByLoginAndOpen(@Param("assigneeLogin") String assigneeLogin);

@Transactional
@Query(
"""
SELECT prbp
FROM PullRequestBadPractice prbp
WHERE prbp.pullrequest.id = :pullRequestId
"""
)
List<PullRequestBadPractice> findByPullRequestId(@Param("pullRequestId") long pullRequestId);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package de.tum.in.www1.hephaestus.activity.badpracticedetector;

import de.tum.in.www1.hephaestus.gitprovider.label.Label;
import de.tum.in.www1.hephaestus.gitprovider.pullrequest.PullRequest;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;

@Component
public class BadPracticeDetectorScheduler {

private static final String READY_TO_MERGE = "ready to merge";

@Qualifier("applicationTaskExecutor")
@Autowired
TaskExecutor taskExecutor;

public void detectBadPracticeForPrIfReadyToMerge(
PullRequest pullRequest,
Set<Label> oldLabels,
Set<Label> newLabels
) {
if (
newLabels.stream().anyMatch(label -> READY_TO_MERGE.equals(label.getName())) &&
oldLabels.stream().noneMatch(label -> READY_TO_MERGE.equals(label.getName()))
) {
BadPracticeDetectorTask badPracticeDetectorTask = new BadPracticeDetectorTask();
badPracticeDetectorTask.setPullRequest(pullRequest);
taskExecutor.execute(badPracticeDetectorTask);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package de.tum.in.www1.hephaestus.activity.badpracticedetector;

import de.tum.in.www1.hephaestus.gitprovider.pullrequest.PullRequest;
import lombok.Getter;
import lombok.Setter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@Component
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IDK if @Component is correct here

@Getter
@Setter
public class BadPracticeDetectorTask implements Runnable {

@Autowired
private PullRequestBadPracticeDetector pullRequestBadPracticeDetector;

private PullRequest pullRequest;

@Override
public void run() {
pullRequestBadPracticeDetector.detectAndSyncBadPractices(pullRequest);
}
}
Loading