From 8a7c02e01a63eb6d613d2133ff6a7289277cf7ac Mon Sep 17 00:00:00 2001 From: Christoph Date: Fri, 17 Apr 2020 16:25:29 +0200 Subject: [PATCH] fix csv format --- .../mops/gruppen2/domain/service/helper/CsvHelper.java | 2 +- .../infrastructure/controller/GroupDetailsController.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/mops/gruppen2/domain/service/helper/CsvHelper.java b/src/main/java/mops/gruppen2/domain/service/helper/CsvHelper.java index a12dc8a..99dddc7 100644 --- a/src/main/java/mops/gruppen2/domain/service/helper/CsvHelper.java +++ b/src/main/java/mops/gruppen2/domain/service/helper/CsvHelper.java @@ -48,7 +48,7 @@ public final class CsvHelper { public static String writeCsvUserList(List members) { StringBuilder builder = new StringBuilder(); - builder.append("id,givenname,familyname,email"); + builder.append("id,givenname,familyname,email\n"); members.forEach(user -> builder.append(user.getId()) .append(",") diff --git a/src/main/java/mops/gruppen2/infrastructure/controller/GroupDetailsController.java b/src/main/java/mops/gruppen2/infrastructure/controller/GroupDetailsController.java index d482a47..79d5972 100644 --- a/src/main/java/mops/gruppen2/infrastructure/controller/GroupDetailsController.java +++ b/src/main/java/mops/gruppen2/infrastructure/controller/GroupDetailsController.java @@ -112,13 +112,13 @@ public class GroupDetailsController { } @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) - @GetMapping("details/{id}/export/history") + @GetMapping(value = "details/{id}/export/history", produces = "text/plain;charset=UTF-8") public void getDetailsExportHistory(HttpServletResponse response, @PathVariable("id") String groupId) { String filename = "eventlog-" + groupId + ".txt"; - response.setContentType("text/txt"); + response.setContentType("text/txt;charset=UTF-8"); response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename + "\""); @@ -130,13 +130,13 @@ public class GroupDetailsController { } @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) - @GetMapping("details/{id}/export/members") + @GetMapping(value = "details/{id}/export/members", produces = "text/csv;charset=UTF-8") public void getDetailsExportMembers(HttpServletResponse response, @PathVariable("id") String groupId) { String filename = "teilnehmer-" + groupId + ".csv"; - response.setContentType("text/csv"); + response.setContentType("text/csv;charset=UTF-8"); response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename + "\"");