diff --git a/src/main/java/de/thm/arsnova/controller/FoodVoteController.java b/src/main/java/de/thm/arsnova/controller/FoodVoteController.java
deleted file mode 100644
index abd82427569fbc6fde2559989f9785c8bc79502b..0000000000000000000000000000000000000000
--- a/src/main/java/de/thm/arsnova/controller/FoodVoteController.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2012 THM webMedia
- *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ARSnova is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package de.thm.arsnova.controller;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.json.JSONObject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import de.thm.arsnova.entities.FoodVote;
-import de.thm.arsnova.services.IFoodService;
-
-@RestController
-@RequestMapping("/canteen/menu/vote")
-public class FoodVoteController extends AbstractController {
-
- public static final Logger LOGGER = LoggerFactory.getLogger(FoodVoteController.class);
-
- @Autowired
- private IFoodService foodService;
-
- @RequestMapping(value = "/", method = RequestMethod.POST)
- public final void setFoodVote(
- @RequestBody final Object menu,
- final HttpServletResponse response
- ) {
- final String menustring = JSONObject.fromObject(menu).getString("menu");
- foodService.vote(menustring);
- }
-
- @RequestMapping(value = "/", method = RequestMethod.GET)
- public final List<FoodVote> getFoodVote() {
- return foodService.getFoodVote();
- }
-
- @RequestMapping(value = "/count", method = RequestMethod.GET, produces = "text/plain")
- public final String getFoodVoteCount() {
- return Integer.toString(foodService.getFoodVoteCount());
- }
-}
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 6ca6d68ca688f3e5aaee35900ad6d343303c1436..3c80c5832441073a4cc1708d76a907162273de08 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -53,7 +53,6 @@ import com.fourspaces.couchdb.ViewResults;
import de.thm.arsnova.connector.model.Course;
import de.thm.arsnova.entities.Answer;
import de.thm.arsnova.entities.DbUser;
-import de.thm.arsnova.entities.FoodVote;
import de.thm.arsnova.entities.InterposedQuestion;
import de.thm.arsnova.entities.InterposedReadingCount;
import de.thm.arsnova.entities.LoggedIn;
@@ -772,39 +771,6 @@ public class CouchDBDao implements IDatabaseDao {
}
}
- @Override
- public List<FoodVote> getFoodVote() {
- final List<FoodVote> foodVotes = new ArrayList<FoodVote>();
- final String date = new SimpleDateFormat("dd-mm-yyyyy").format(new Date());
- final NovaView view = new NovaView("food_vote/count_by_day");
- view.setStartKeyArray(date);
- view.setEndKeyArray(date, "{}");
- view.setGroup(true);
- final ViewResults results = getDatabase().view(view);
- for (final Document d : results.getResults()) {
- final FoodVote vote = new FoodVote();
- vote.setCount(d.getJSONObject().optInt("value"));
- vote.setDay(date);
- vote.setName(d.getJSONObject().getJSONArray("key").getString(1));
- foodVotes.add(vote);
- }
- return foodVotes;
- }
-
- @Override
- public int getFoodVoteCount() {
- final String date = new SimpleDateFormat("dd-mm-yyyyy").format(new Date());
- final NovaView view = new NovaView("food_vote/count_by_day");
- view.setStartKeyArray(date);
- view.setEndKeyArray(date, "{}");
- view.setGroup(false);
- final ViewResults results = getDatabase().view(view);
- if (results.size() == 0 || results.getResults().size() == 0) {
- return 0;
- }
- return results.getJSONArray("rows").optJSONObject(0).optInt("value");
- }
-
@Override
public int countSessions() {
return sessionsCountValue("openSessions")
diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
index 67eaeaede0dd6e5c367b0d2465a56cd72a2cf73b..70b76c55f4c988017e751a8f777b62662a521385 100644
--- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
+++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
@@ -25,7 +25,6 @@ import java.util.List;
import de.thm.arsnova.connector.model.Course;
import de.thm.arsnova.entities.Answer;
import de.thm.arsnova.entities.DbUser;
-import de.thm.arsnova.entities.FoodVote;
import de.thm.arsnova.entities.InterposedQuestion;
import de.thm.arsnova.entities.InterposedReadingCount;
import de.thm.arsnova.entities.LoggedIn;
@@ -88,10 +87,6 @@ public interface IDatabaseDao {
void vote(User me, String menu);
- int getFoodVoteCount();
-
- List<FoodVote> getFoodVote();
-
int countSessions();
int countOpenSessions();
diff --git a/src/main/java/de/thm/arsnova/entities/FoodVote.java b/src/main/java/de/thm/arsnova/entities/FoodVote.java
deleted file mode 100644
index feac308ddb5cd230b7730e52953459900ac10beb..0000000000000000000000000000000000000000
--- a/src/main/java/de/thm/arsnova/entities/FoodVote.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package de.thm.arsnova.entities;
-
-public class FoodVote {
- private String _id;
- private String _rev;
- private String type;
- private String name;
- private int count;
- private String day;
-
- public FoodVote() {
- this.type = "food_vote";
- }
-
- public String get_id() {
- return _id;
- }
-
- public void set_id(String _id) {
- this._id = _id;
- }
-
- public String get_rev() {
- return _rev;
- }
-
- public void set_rev(String _rev) {
- this._rev = _rev;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getCount() {
- return count;
- }
-
- public void setCount(int count) {
- this.count = count;
- }
-
- public String getDay() {
- return day;
- }
-
- public void setDay(String day) {
- this.day = day;
- }
-}
diff --git a/src/main/java/de/thm/arsnova/services/FoodService.java b/src/main/java/de/thm/arsnova/services/FoodService.java
deleted file mode 100644
index e8d6ac01915e7ab8b311e0cc9b4e18308dd4b346..0000000000000000000000000000000000000000
--- a/src/main/java/de/thm/arsnova/services/FoodService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2012 THM webMedia
- *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ARSnova is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.thm.arsnova.services;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Service;
-
-import de.thm.arsnova.dao.IDatabaseDao;
-import de.thm.arsnova.entities.FoodVote;
-
-@Service
-public class FoodService implements IFoodService {
-
- @Autowired
- private IDatabaseDao databaseDao;
-
- @Autowired
- private IUserService userService;
-
- public final void setDatabaseDao(IDatabaseDao databaseDao) {
- this.databaseDao = databaseDao;
- }
-
- @Override
- @PreAuthorize("isAuthenticated()")
- public void vote(String menu) {
- this.databaseDao.vote(userService.getCurrentUser(), menu);
-
- }
-
- @Override
- public List<FoodVote> getFoodVote() {
- return this.databaseDao.getFoodVote();
- }
-
- @Override
- public int getFoodVoteCount() {
- return this.databaseDao.getFoodVoteCount();
- }
-}
diff --git a/src/main/java/de/thm/arsnova/services/IFoodService.java b/src/main/java/de/thm/arsnova/services/IFoodService.java
deleted file mode 100644
index dbd2c1fce2f8253c9dc9f57336489c3829a17b89..0000000000000000000000000000000000000000
--- a/src/main/java/de/thm/arsnova/services/IFoodService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2012 THM webMedia
- *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ARSnova is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.thm.arsnova.services;
-
-import java.util.List;
-
-import de.thm.arsnova.entities.FoodVote;
-
-public interface IFoodService {
-
- void vote(String menu);
-
- int getFoodVoteCount();
-
- List<FoodVote> getFoodVote();
-
-}
diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
index 8dcafd979a2068b3220978605480cabd57c21586..0c61d957ba7e4712e8e1cf624ac53885fcb45f0d 100644
--- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
+++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
@@ -28,7 +28,6 @@ import de.thm.arsnova.connector.model.Course;
import de.thm.arsnova.entities.Answer;
import de.thm.arsnova.entities.DbUser;
import de.thm.arsnova.entities.Feedback;
-import de.thm.arsnova.entities.FoodVote;
import de.thm.arsnova.entities.InterposedQuestion;
import de.thm.arsnova.entities.InterposedReadingCount;
import de.thm.arsnova.entities.LoggedIn;
@@ -264,18 +263,6 @@ public class StubDatabaseDao implements IDatabaseDao {
}
- @Override
- public int getFoodVoteCount() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public List<FoodVote> getFoodVote() {
- // TODO Auto-generated method stub
- return null;
- }
-
@Override
public int countAnswers() {
// TODO Auto-generated method stub