From f124699d3ed887ec2774f0f5d69362aea5e1a86f Mon Sep 17 00:00:00 2001
From: Michael Breu <Michael.Breu@arctis.at>
Date: Tue, 23 Jan 2024 15:10:28 +0100
Subject: [PATCH] sonar and fixing deployment
---
.gitlab-ci.yml | 2 ++
.../uibk/gitsearch/service/ChatMessageService.java | 4 +---
.../at/ac/uibk/gitsearch/service/GitlabService.java | 3 +--
.../gitsearch/web/rest/AchievementResource.java | 2 +-
.../ac/uibk/gitsearch/web/rest/LikesResource.java | 13 -------------
src/main/resources/.h2.server.properties | 2 +-
.../user-watch-list/user-watch-list.component.ts | 4 ++--
.../bookmarkInfo/bookmarkInfo.component.html | 6 ------
.../bookmarkInfo/bookmarkInfo.component.scss | 0
.../exercise/bookmarkInfo/bookmarkInfo.component.ts | 1 -
.../exercise-card/exercise-card.component.ts | 2 +-
.../exercise-details/exercise-details.component.ts | 2 +-
.../exercise-metadata.component.scss | 0
.../exercise-metadata.component.ts | 1 -
14 files changed, 10 insertions(+), 32 deletions(-)
delete mode 100644 src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.scss
delete mode 100644 src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.scss
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 953f6256a..f84433f5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,6 +144,7 @@ deploy:
variables:
REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/development/sharing/codeability-sharing-platform/gitsearch/$CI_COMMIT_REF_NAME
+ GITSEARCH_PATH: /home/contDeploy/gitsearch2/gitsearch
script:
- ssh contDeploy@codeability-austria -p 1022 "export CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME && export COMMIT_DATE=$(git show -s --format=%ct $CI_COMMIT_SHA) && export GITSEARCH_PATH=${GITSEARCH_PATH} && cd gitsearch2/gitsearch && git fetch && git stash && git checkout $CI_COMMIT_REF_NAME && git pull && ./manual_deploy.sh && exit"
when: manual
@@ -164,6 +165,7 @@ deployProd:
variables:
REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/development/sharing/codeability-sharing-platform/gitsearch/$CI_COMMIT_REF_NAME
+ GITSEARCH_PATH: /home/contDeploy/gitsearch
script:
- ssh contDeploy@sharing-codeability -p 1022 "export REGISTRY_URL=$REGISTRY_URL export CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME && export COMMIT_DATE=$(git show -s --format=%ct $CI_COMMIT_SHA) && cd gitsearch/ && git fetch && git stash && git checkout $CI_COMMIT_REF_NAME && git pull && ./manual_deploy.sh && exit"
when: manual
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/ChatMessageService.java b/src/main/java/at/ac/uibk/gitsearch/service/ChatMessageService.java
index a67b6deff..5de4441b6 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/ChatMessageService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/ChatMessageService.java
@@ -58,9 +58,7 @@ public class ChatMessageService {
ChatMessage chatMessage = new ChatMessage();
Review review = reviewRepository.getById(chatMessageDTO.getReviewID());
- if (review == null) {
- log.warn("Review not found for ID: {}", chatMessageDTO.getReviewID());
- }
+
chatMessage.setReview(review);
chatMessage.setTimestamp(new Date());
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java b/src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java
index f558766a8..0078971d8 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java
@@ -234,7 +234,6 @@ public class GitlabService {
try {
project = projectApi.createProject(project);
} catch (GitLabApiException e) {
- log.error("An error occurred while creating the new Gitlab project : {}", e.getMessage(), e);
throw new ArtemisImportError("exercise.import.error.creationFailed", e);
}
@@ -253,7 +252,7 @@ public class GitlabService {
git.commit().setAll(true).setMessage("Importing files").setCommitter(currentUser.getUsername(), currentUser.getEmail()).call();
git.push().setCredentialsProvider(CredentialsProvider.getDefault()).call();
} catch (GitLabApiException | GitAPIException e) {
- log.warn("Could not commit: {} \n", e.getMessage(), e);
+ log.info("Could not commit: {} \n", e.getMessage(), e);
if (git.getRepository().getDirectory().getParentFile().exists()) {
try {
FileUtils.deleteDirectory(git.getRepository().getDirectory().getParentFile());
diff --git a/src/main/java/at/ac/uibk/gitsearch/web/rest/AchievementResource.java b/src/main/java/at/ac/uibk/gitsearch/web/rest/AchievementResource.java
index 4fa796b25..4436b80d8 100644
--- a/src/main/java/at/ac/uibk/gitsearch/web/rest/AchievementResource.java
+++ b/src/main/java/at/ac/uibk/gitsearch/web/rest/AchievementResource.java
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
@Transactional
public class AchievementResource {
- private final Logger log = LoggerFactory.getLogger(SearchResource.class);
+ private final Logger log = LoggerFactory.getLogger(AchievementResource.class);
private final AchievementService achievementService;
diff --git a/src/main/java/at/ac/uibk/gitsearch/web/rest/LikesResource.java b/src/main/java/at/ac/uibk/gitsearch/web/rest/LikesResource.java
index 522c66cec..3c7b01b50 100644
--- a/src/main/java/at/ac/uibk/gitsearch/web/rest/LikesResource.java
+++ b/src/main/java/at/ac/uibk/gitsearch/web/rest/LikesResource.java
@@ -252,17 +252,4 @@ public class LikesResource {
.headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, ENTITY_NAME, id.toString()))
.build();
}
- // /**
- // * {@code SEARCH /_search/likes?query=:query} : search for the likes
- // * corresponding to the query.
- // *
- // * @param query the query of the likes search.
- // * @return the result of the search.
- // */
- // @GetMapping("/_search/likes")
- // @PreAuthorize("hasAnyRole('ADMIN')")
- // public List<Likes> searchLikes(@RequestParam String query) {
- // log.debug("REST request to search Likes for query {}", query);
- // return likesService.search(query);
- // }
}
diff --git a/src/main/resources/.h2.server.properties b/src/main/resources/.h2.server.properties
index 93f0ac044..37f6522a3 100644
--- a/src/main/resources/.h2.server.properties
+++ b/src/main/resources/.h2.server.properties
@@ -1,5 +1,5 @@
#H2 Server Properties
-#Thu Aug 10 09:57:52 CEST 2023
+#Tue Jan 23 13:29:36 CET 2024
0=JHipster H2 (Disk)|org.h2.Driver|jdbc\:h2\:file\:./target/h2db/db/gitsearch|gitsearch
webSSL=false
webAllowOthers=true
diff --git a/src/main/webapp/app/entities/user-watch-list/user-watch-list.component.ts b/src/main/webapp/app/entities/user-watch-list/user-watch-list.component.ts
index 695f2fd4c..c935de2cb 100644
--- a/src/main/webapp/app/entities/user-watch-list/user-watch-list.component.ts
+++ b/src/main/webapp/app/entities/user-watch-list/user-watch-list.component.ts
@@ -136,8 +136,8 @@ export class UserWatchListComponent implements OnInit, OnDestroy {
const headersLink = headers.get('link');
this.links = this.parseLinks.parse(headersLink ? headersLink : '');
if (data) {
- for (let i = 0; i < data.length; i++) {
- this.userWatchLists.push(data[i]);
+ for (let dataItem of data) {
+ this.userWatchLists.push(dataItem);
}
}
}
diff --git a/src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.html b/src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.html
index 330913475..f44e988d6 100644
--- a/src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.html
+++ b/src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.html
@@ -3,10 +3,4 @@
<A [routerLink]="['/bookmarks']" style="font-weight: bold; cursor: pointer">{{
getCurrentWatchList() ? getCurrentWatchList()!.userWatchList.name : 'undefined'
}}</A>
- <!--
- <button class="btn btn-outline-primary mr-2" id="dropdownManual" ngbDropdownToggle ngbDropdownAnchor>{{'gitsearchApp.userWatchList.selectedList'|translate}}<br/>{{getCurrentWatchList()?getCurrentWatchList()!.userWatchList.name:'undefined'}}</button>
- <div ngbDropdownMenu aria-labelledby="dropdownManual" >
- <button ngbDropdownItem *ngFor="let watchList of getMyWatchLists()" (click)="setCurrentWatchList(watchList.name)">{{watchList.name}}</button>
- </div>
- -->
</div>
diff --git a/src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.scss b/src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.ts b/src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.ts
index ba48ea58b..ad05b52f7 100644
--- a/src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.ts
+++ b/src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.ts
@@ -5,7 +5,6 @@ import { IUserWatchList, UserWatchListWithContent } from 'app/shared/model/user-
@Component({
selector: 'jhi-bookmark-info',
templateUrl: './bookmarkInfo.component.html',
- styleUrls: ['./bookmarkInfo.component.scss'],
})
export class BookmarkInfoComponent {
constructor(private watchlistManager: WatchlistManager) {}
diff --git a/src/main/webapp/app/exercise/exercise-card/exercise-card.component.ts b/src/main/webapp/app/exercise/exercise-card/exercise-card.component.ts
index 34735555e..6ee1bda2d 100644
--- a/src/main/webapp/app/exercise/exercise-card/exercise-card.component.ts
+++ b/src/main/webapp/app/exercise/exercise-card/exercise-card.component.ts
@@ -52,7 +52,7 @@ export class ExerciseCardComponent implements AfterViewChecked {
* correct missing image urls
*/
correctImageURL(event: Event): void {
- const img = event.srcElement as HTMLImageElement;
+ const img = event.target as HTMLImageElement;
if (img) {
img.src = '/content/images/Logo_codeAbility_4c_300dpi_RGB3.gif';
}
diff --git a/src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts b/src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts
index 52c3d7f1c..968d1d460 100644
--- a/src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts
+++ b/src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts
@@ -66,7 +66,7 @@ export class ExerciseHeaderComponent {
* correct missing image urls
*/
correctImageURL(event: Event): void {
- const srcElement = event.srcElement as HTMLImageElement;
+ const srcElement = event.target as HTMLImageElement;
if (srcElement) {
srcElement.src = '/content/images/Logo_codeAbility_4c_300dpi_RGB3.gif';
}
diff --git a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.scss b/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.ts b/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.ts
index 7e2be9f7e..b5550b7fc 100644
--- a/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.ts
+++ b/src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.ts
@@ -10,7 +10,6 @@ import { SearchResultDTO } from 'app/shared/model/search/search-result-dto.model
@Component({
selector: 'jhi-exercise-metadata',
templateUrl: './exercise-metadata.component.html',
- styleUrls: ['./exercise-metadata.component.scss'],
})
export class ExerciseMetadataComponent implements OnInit, OnDestroy {
@Input() exercise: SearchResultDTO | undefined;
--
GitLab