Skip to content

Commit

Permalink
chore: P4ADEV-2087-run-code-review-with-github-action (#139)
Browse files Browse the repository at this point in the history
  • Loading branch information
LarissaASLeite authored Feb 3, 2025
1 parent 2cd02e1 commit e91df76
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 58 deletions.
53 changes: 0 additions & 53 deletions .devops/code-review-pipelines.yml

This file was deleted.

51 changes: 51 additions & 0 deletions .github/workflows/codereview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: p4pa-auth - Code Review

on:
push:
branches:
- main
- uat
- develop
pull_request:
types:
- opened
- edited
- synchronize
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
with:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
with:
distribution: 'corretto'
java-version: 21

- name: Grant execute permission for gradlew
run: chmod +x ./gradlew

- name: Build with Gradle
working-directory: ./
run: ./gradlew clean build jacocoTestReport
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Sonar Scan
working-directory: ./
run: >
./gradlew sonar
-Dorg.gradle.jvmargs=-Xmx4096M
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.organization=${{ vars.SONARCLOUD_ORG }}
-Dsonar.projectKey=${{ vars.SONARCLOUD_PROJECT_KEY }}
-Dsonar.projectName="${{ vars.SONARCLOUD_PROJECT_NAME }}"
-Dsonar.token=${{ secrets.SONAR_TOKEN }}
-Dsonar.sources=src/main
-Dsonar.tests=src/test
-Dsonar.coverage.jacoco.xmlReportPaths=build/reports/jacoco/test/jacocoTestReport.xml
-Dsonar.exclusions='**/enums/**, **/model/**, **/dto/**, **/*Constant*, **/*Config.java, **/*Scheduler.java, **/*Application.java, **/src/test/**, **/Dummy*.java'
4 changes: 3 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ version = "0.1.0"
description = "p4pa-auth"

java {
sourceCompatibility = JavaVersion.VERSION_21
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}

configurations {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

@Service
public class IamUserInfoDTO2UserInfoMapper {
Expand Down Expand Up @@ -89,7 +90,7 @@ private UserInfo userInfoMapper(IamUserInfoDTO iamUserInfoDTO, String accessToke
.email(r.getEmail())
.organizationId(retrieveOrganizationId(r.getOrganizationIpaCode(), accessToken))
.build())
.toList())
.collect(Collectors.toList()))
.build();

if (iamUserInfoDTO.getOrganizationAccess() != null) {
Expand All @@ -113,7 +114,7 @@ private Long retrieveOrganizationId(String organizationIpaCode, String accessTok
private Broker getSessionBroker(IamUserInfoDTO iamUserInfoDTO, List<UserOrganizationRoles> userOrganizations, String accessToken) {
String orgIpaCode = Optional.ofNullable(iamUserInfoDTO.getOrganizationAccess())
.map(IamUserOrganizationRolesDTO::getOrganizationIpaCode)
.orElseGet(() -> userOrganizations.isEmpty() ? null : userOrganizations.get(0).getOrganizationIpaCode());
.orElseGet(() -> userOrganizations.isEmpty() ? null : userOrganizations.getFirst().getOrganizationIpaCode());

if (orgIpaCode != null) {
Organization organization = organizationSearchClient.getOrganizationByIpaCode(orgIpaCode, accessToken);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import java.util.ArrayList;
import java.util.List;
import java.util.function.BiFunction;
import java.util.stream.Collectors;

import org.springframework.stereotype.Service;

@Service
Expand All @@ -28,7 +30,7 @@ public UserInfo apply(User user, List<Operator> operator) {
.roles(new ArrayList<>(r.getRoles()))
.email(r.getEmail())
.build())
.toList())
.collect(Collectors.toList()))
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -49,7 +51,7 @@ void test() {
.roles(new ArrayList<>(r.getRoles()))
.email(r.getEmail())
.build())
.toList())
.collect(Collectors.toList()))
.build(),
result
);
Expand Down

0 comments on commit e91df76

Please sign in to comment.