From 113dbfcc321101eb1994edbc0b38cfec2e81ebe2 Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Mon, 27 May 2019 15:55:29 +0200 Subject: [PATCH 1/2] Changed name of war artifacts --- build.gradle | 5 +++++ labswp_2019_sose_geocaching_frontend/build.gradle | 2 ++ labswp_2019_sose_geocaching_frontend/frontend/quasar.conf.js | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ba127e3..3dc4e7d 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,11 @@ repositories { mavenCentral() } +bootWar{ + baseName = 'buga19geocachingbackend' + archiveName 'buga19geocachingbackend.war' +} + dependencies { compile project('labswp_2019_sose_geocaching_frontend') //Java Spring diff --git a/labswp_2019_sose_geocaching_frontend/build.gradle b/labswp_2019_sose_geocaching_frontend/build.gradle index 001bc0d..0965012 100644 --- a/labswp_2019_sose_geocaching_frontend/build.gradle +++ b/labswp_2019_sose_geocaching_frontend/build.gradle @@ -18,6 +18,8 @@ war { from 'web/' // adds a file-set to the root of the archive webInf { from 'WEB-INF' } // adds a file-set to the WEB-INF dir. webXml = file('WEB-INF/web.xml') // copies a file to WEB-INF/web.xml + baseName = 'buga19geocaching' + archiveName 'buga19geocaching.war' } buildDir '../build' diff --git a/labswp_2019_sose_geocaching_frontend/frontend/quasar.conf.js b/labswp_2019_sose_geocaching_frontend/frontend/quasar.conf.js index 54496d0..bfe65e3 100644 --- a/labswp_2019_sose_geocaching_frontend/frontend/quasar.conf.js +++ b/labswp_2019_sose_geocaching_frontend/frontend/quasar.conf.js @@ -120,7 +120,7 @@ module.exports = function (ctx) { } : { // Base URL for API-Calls: PRODUCTION (build) //API: JSON.stringify('http://localhost:8080'), - API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocaching'), + API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocachingbackend'), USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement') } }, From f6e0b2826acacfd4e7bd1d17c10c424e713161bd Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 27 May 2019 16:50:55 +0200 Subject: [PATCH 2/2] fixed rankingPlace bug showing different rankings --- .../repositories/UserRepository.java | 57 +++++++++++++------ 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java index be6e8a0..25ec2f9 100644 --- a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java +++ b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java @@ -9,31 +9,54 @@ import java.util.List; public interface UserRepository extends CrudRepository { User findByEmail(String email); - @Query(value = "SELECT DISTINCT u.id AS ID, username AS Name, ui.ranking_points_sum AS Ranglistenpunkte\n" + +// @Query(value = "SELECT DISTINCT u.id AS ID, username AS Name, ui.ranking_points_sum AS Ranglistenpunkte\n" + +// "FROM user u,\n" + +// " user_info ui,\n" + +// " user_roles ur\n" + +// "WHERE u.id = ui.user_id\n" + +// "AND u.id = ur.user_id\n" + +// "order by ranking_points_sum DESC\n" + +// "LIMIT 10;", nativeQuery = true) +// List getRankingList(); + + @Query(value = "SELECT DISTINCT u.id AS ID, username AS Name, ui.ranking_points_sum AS Ranglistenpunkte, email Email\n" + "FROM user u,\n" + " user_info ui,\n" + " user_roles ur\n" + "WHERE u.id = ui.user_id\n" + - "AND u.id = ur.user_id\n" + - "order by ranking_points_sum DESC\n" + + " AND u.id = ur.user_id\n" + + "order by ranking_points_sum DESC, Email\n" + "LIMIT 10;", nativeQuery = true) List getRankingList(); + +// @Query(value = "SELECT Rang\n" + +// "From (\n" + +// "\n" + +// "SELECT ROW_NUMBER() over(order by INR.Ranglistenpunkte DESC) AS Rang, Name\n" + +// "FROM (\n" + +// " SELECT DISTINCT u.Email AS Name,\n" + +// " ui.ranking_points_sum AS Ranglistenpunkte\n" + +// " FROM user u,\n" + +// " user_info ui,\n" + +// " user_roles ur\n" + +// " WHERE u.id = ui.user_id\n" + +// " AND u.id = ur.user_id\n" + +// " order by ranking_points_sum DESC) as INR) as RN\n" + +// "WHERE Name = ?1", nativeQuery = true) +// int getRankingPlaceFromUser(String username); + @Query(value = "SELECT Rang\n" + - "From (\n" + - "\n" + - "SELECT ROW_NUMBER() over(order by INR.Ranglistenpunkte DESC) AS Rang, Name\n" + - "FROM (\n" + - " SELECT DISTINCT u.Email AS Name,\n" + - " ui.ranking_points_sum AS Ranglistenpunkte\n" + - " FROM user u,\n" + - " user_info ui,\n" + - " user_roles ur\n" + - " WHERE u.id = ui.user_id\n" + - " AND u.id = ur.user_id\n" + - " order by ranking_points_sum DESC) as INR) as RN\n" + - "WHERE Name = ?1", nativeQuery = true) - int getRankingPlaceFromUser(String username); + "From (SELECT ROW_NUMBER() over(order by INR.Ranglistenpunkte DESC, Email) AS Rang, Email\n" + + " FROM (SELECT DISTINCT u.id AS ID, username AS Name, ui.ranking_points_sum AS Ranglistenpunkte, email Email\n" + + " FROM user u,\n" + + " user_info ui,\n" + + " user_roles ur\n" + + " WHERE u.id = ui.user_id\n" + + " AND u.id = ur.user_id\n" + + " order by ranking_points_sum DESC, Email) as INR) as RN\n" + + "WHERE Email = ?1", nativeQuery = true) + int getRankingPlaceFromUser(String username); @Query(value = "SELECT DISTINCT t.name AS teamname, SUM(ui.ranking_points_sum) AS Ranglistenpunkte\n" + "FROM user u,\n" +