sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add totalVeganMeal property and fix checkstyle errors

Browse Source
This commit is contained in:
cugurlu
2019-03-18 12:14:30 +01:00
parent f66191f136
commit a2e432d453
11 changed files with 81 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Client/src/main/java/greenify/client/controller/DashBoardController.java
View File

@@ -3,8 +3,7 @@ package greenify.client.controller;
import greenify.client.rest.UserService;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.layout.AnchorPane;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -17,17 +16,19 @@ public class DashBoardController {
private int count = 0;
@FXML
private AnchorPane menuBar;
private AnchorPane dashboardPane;
@FXML
private AnchorPane userPane;
@FXML
private AnchorPane activitiesPane;
private Label welcomebacktext;
private Button dashboardButton;
private Button activitiesButton;
private Button userButton;
private Button veganMealButton;
private Label counter;
private Label scoreField;
@FXML
private TextField counter;
@FXML
private TextField totalCount;
/**
* displays the dashboard pane.
@@ -45,6 +46,7 @@ public class DashBoardController {
* @param event the event (clicking the button)
*/
public void displayActivities(ActionEvent event) {
totalCount.setText("Total Count: " + userService.currentUser.getVeganMeal());
System.out.println("display activities");
dashboardPane.setVisible(false);
userPane.setVisible(false);
@@ -68,6 +70,8 @@ public class DashBoardController {
*/
public void addVeganMeal(ActionEvent event) {
count++;
int net = userService.currentUser.getVeganMeal() + count;
totalCount.setText("Total Count: " + net);
counter.setText("Count: " + count);
System.out.println(userService);
userService.addVeganMeal(userService.currentUser.getId(),

6
src/Client/src/main/java/greenify/client/controller/UserController.java
View File

@@ -24,8 +24,14 @@ public class UserController {
@FXML
private TextField usernameField;
@FXML
private PasswordField passwordField;
@FXML
private Button loginButton;
@FXML
private Button signupButton;
@FXML

7
src/Client/src/main/java/greenify/client/rest/UserService.java
View File

@@ -8,6 +8,8 @@ import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
@@ -79,4 +81,9 @@ public class UserService {
System.out.println(builder.build().encode().toUri());
return this.restTemplate.getForObject(builder.build().encode().toUri(), UserDto.class);
}
@RequestMapping("/userData")
public int getVeganData(@RequestParam(value = "veganMeal") int veganMeal) {
return veganMeal;
}
}

47
src/Client/src/main/resources/fxml/dashboard.fxml
View File

@@ -1,13 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.*?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Line?>
<?import javafx.scene.text.*?>
<AnchorPane prefHeight="602.0" prefWidth="934.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="greenify.client.controller.DashBoardController">
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<AnchorPane prefHeight="602.0" prefWidth="934.0" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="greenify.client.controller.DashBoardController">
<children>
<AnchorPane fx:id="activitiesPane" layoutX="214.0" prefHeight="603.0" prefWidth="711.0" visible="false">
<children>
<Text layoutX="101.0" layoutY="74.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Available Activities" AnchorPane.leftAnchor="60.0" AnchorPane.topAnchor="40.0">
<font>
<Font size="30.0" />
</font>
</Text>
<Button fx:id="veganMealButton" layoutX="60.0" layoutY="140.0" mnemonicParsing="false" onAction="#addVeganMeal" style="-fx-background-color: #009623; -fx-border-radius: 25px;" text="Add a vegetarian meal" textFill="#e0ffe1">
<font>
<Font size="14.0" />
</font>
</Button>
<TextField fx:id="totalCount" layoutX="482.0" layoutY="137.0" prefHeight="40.0" prefWidth="176.0" text="Total Count: " />
<TextField fx:id="counter" layoutX="288.0" layoutY="137.0" prefHeight="40.0" prefWidth="176.0" text="Count:" />
</children></AnchorPane>
<AnchorPane fx:id="menuBar" prefHeight="603.0" prefWidth="216.0" style="-fx-background-color: #5a635c;">
<children>
<Label alignment="CENTER" contentDisplay="CENTER" layoutY="-2.0" prefHeight="90.0" prefWidth="216.0" text="Go Green" textAlignment="CENTER" textFill="#71bc84">
@@ -33,24 +54,6 @@
<Line endX="104.0" layoutX="102.0" layoutY="133.0" scaleY="0.7" startX="-100.0" stroke="#e3ffe8" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" />
<Line endX="104.0" layoutX="105.0" layoutY="178.0" scaleY="0.7" startX="-100.0" stroke="#e3ffe8" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" />
</children></AnchorPane>
<AnchorPane fx:id="activitiesPane" layoutX="214.0" prefHeight="603.0" prefWidth="711.0" visible="false">
<children>
<Text layoutX="101.0" layoutY="74.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Available Activities" AnchorPane.leftAnchor="60.0" AnchorPane.topAnchor="40.0">
<font>
<Font size="30.0" />
</font>
</Text>
<Button fx:id="veganMealButton" layoutX="60.0" layoutY="116.0" mnemonicParsing="false" style="-fx-background-color: #009623; -fx-border-radius: 25px;" onAction="#addVeganMeal" text="Add a vegetarian meal" textFill="#e0ffe1">
<font>
<Font size="14.0" />
</font>
</Button>
<Label fx:id="counter" layoutX="288.0" layoutY="110.0" prefHeight="44.0" prefWidth="115.0" text="Count: ">
<font>
<Font size="25.0" />
</font>
</Label>
</children></AnchorPane>
<AnchorPane fx:id="userPane" layoutX="215.0" layoutY="-1.0" prefHeight="603.0" prefWidth="711.0" visible="false">
<children>
<Text layoutX="94.0" layoutY="72.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Your Profile" AnchorPane.leftAnchor="60.0" AnchorPane.topAnchor="40.0">

6
src/Client/src/test/java/UserServiceTest.java
View File

@@ -25,7 +25,7 @@ public class UserServiceTest {
@Test
public void userRegisterTest() throws Exception {
UserDto testUser = new UserDto(1L, "Eric");
UserDto testUser = new UserDto(1L, "Eric", 0);
Mockito.when(restTemplate.getForObject(new java.net.URI("http://localhost:8080/registerUser?name=Eric&password=password"),
UserDto.class))
.thenReturn(testUser);
@@ -36,7 +36,7 @@ public class UserServiceTest {
@Test
public void userLoginTest() throws Exception {
UserDto testUser = new UserDto(1L, "Eric");
UserDto testUser = new UserDto(1L, "Eric", 0);
Mockito.when(restTemplate.getForObject(new java.net.URI("http://localhost:8080/loginUser?name=Eric&password=password"),
UserDto.class))
.thenReturn(testUser);
@@ -46,7 +46,7 @@ public class UserServiceTest {
@Test
public void addVeganMealTest() throws Exception {
UserDto testUser = new UserDto(1L, "Eric");
UserDto testUser = new UserDto(1L, "Eric", 0);
Mockito.when(restTemplate.getForObject(new java.net.URI("http://localhost:8080/addVeganMeal?id=1&name=Eric"),
UserDto.class))
.thenReturn(testUser);

18
src/Common/src/main/java/greenify/common/UserDto.java
View File

@@ -7,13 +7,21 @@ package greenify.common;
public class UserDto {
private Long id;
private String name;
private int veganMeal;
public UserDto() {
}
public UserDto(Long id, String name) {
/**
* The constructor method of UserDto.
* @param id of the user
* @param name of the user
* @param veganMeal the number of vegetarian meals eaten
*/
public UserDto(Long id, String name, int veganMeal) {
this.id = id;
this.name = name;
this.veganMeal = veganMeal;
}
public String getName() {
@@ -31,4 +39,12 @@ public class UserDto {
public void setId(Long id) {
this.id = id;
}
public int getVeganMeal() {
return veganMeal;
}
public void setVeganMeal(int veganMeal) {
this.veganMeal = veganMeal;
}
}

8
src/Common/src/test/java/UserDtoTest.java
View File

@@ -7,18 +7,20 @@ import org.junit.Test;
public class UserDtoTest {
@Test
public void setAndGetTest() {
UserDto user = new UserDto(1L, "greenify");
UserDto testUser = new UserDto();
testUser.setId(1L);
testUser.setName("greenify");
testUser.setVeganMeal(0);
UserDto user = new UserDto(1L, "greenify", 0);
assertTrue(user.getId() == 1L);
assertEquals(user.getName(), "greenify");
assertTrue(user.getVeganMeal() == 0);
}
@Test
public void equalsTest() {
UserDto first = new UserDto(1L, "greenify");
UserDto second = new UserDto(1L, "greenify");
UserDto first = new UserDto(1L, "greenify", 0);
UserDto second = new UserDto(1L, "greenify", 0);
assertEquals(first.getId(), second.getId());
assertEquals(first.getName(), second.getName());
}

4
src/Server/src/main/java/greenify/server/rest/UserController.java
View File

@@ -1,14 +1,10 @@
package greenify.server.rest;
import greenify.common.UserDto;
import greenify.server.data.model.User;
import greenify.server.data.repository.UserRepository;
import greenify.server.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
@RestController

4
src/Server/src/main/java/greenify/server/service/UserService.java
View File

@@ -32,7 +32,7 @@ public class UserService {
throw new ApplicationException("User already exists");
}
logger.info("Created user id=" + user.getId() + ", name=" + user.getName());
return new UserDto(user.getId(), user.getName());
return new UserDto(user.getId(), user.getName(), user.getVeganMeal());
}
/**
@@ -50,7 +50,7 @@ public class UserService {
throw new ApplicationException("Wrong password");
}
}
return new UserDto(user.getId(), user.getName());
return new UserDto(user.getId(), user.getName(), user.getVeganMeal());
}
/**

4
src/Server/src/test/java/greenify/server/rest/UserControllerTest.java
View File

@@ -34,7 +34,7 @@ public class UserControllerTest {
@Test
public void registerUserTest() throws Exception {
given(this.userService.registerUser("name", "password"))
.willReturn(new UserDto(1L, "name"));
.willReturn(new UserDto(1L, "name", 0));
mvc.perform(get("/registerUser")
.param("name", "name")
.param("password", "password")
@@ -46,7 +46,7 @@ public class UserControllerTest {
@Test
public void loginUserTest() throws Exception {
given(this.userService.loginUser("ceren", "password"))
.willReturn(new UserDto(1L, "ceren"));
.willReturn(new UserDto(1L, "ceren", 0));
mvc.perform(get("/loginUser")
.param("name", "ceren")
.param("password", "password")

19
src/Server/src/test/java/greenify/server/service/UserServiceTest.java
View File

@@ -56,25 +56,6 @@ public class UserServiceTest {
assertEquals(userRepository.findAll(), userService.getAllUsers());
}
// @Test
// public void validRegisterTest() {
// String name = "new";
// String password = "user";
// if(userRepository.findByName(name) == null) {
// UserDto found = userService.registerUser(name, password);
// assertEquals(found.getName(), name);
// }
// }
// @Test
// public void addVeganMealTest() {
// User user = new User(1L, "name", "password", 0);
// User user = userRepository.findByName("x");
// int veganMeal = user.getVeganMeal();
// userService.addVeganMeal(user.getId(), user.getName());
// assertEquals(user.getVeganMeal(), veganMeal++);
// }
@Test
public void invalidLoginTest() {
User user = null;