Cedric/XpenselyServer
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

initial Release request #1

Merged
Cedric merged 34 commits from dev into main 2025-01-12 10:46:30 +01:00
Conversation 0 Commits 34 Files Changed 31 +659 -157
20 changed files with 659 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa4ed91b9d - Show all commits

199
apiDesign.drawio Normal file
View File

@@ -0,0 +1,199 @@
<mxfile host="65bd71144e">
<diagram id="TZX9Tq6sZIlTxQ58HocZ" name="Page-1">
<mxGraphModel dx="826" dy="472" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
<mxCell id="2" value="ExpenseList" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#647687;fontColor=#ffffff;strokeColor=#314354;" parent="1" vertex="1">
<mxGeometry x="360" y="60" width="120" height="60" as="geometry"/>
</mxCell>
<mxCell id="5" value="add expense" style="ellipse;whiteSpace=wrap;html=1;fillColor=#fa6800;fontColor=#000000;strokeColor=#C73500;" parent="1" vertex="1">
<mxGeometry x="550" y="190" width="90" height="50" as="geometry"/>
</mxCell>
<mxCell id="6" value="id" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="470" y="30" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="7" value="owner" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="470" y="50" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="8" value="name" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="470" y="70" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="9" value="sharedWith" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="470" y="90" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="10" value="expenses" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="470" y="110" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="11" value="List&amp;lt;User&amp;gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="590" y="90" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="13" value="List&amp;lt;Expense&amp;gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="590" y="110" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="14" value="String" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="590" y="70" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="15" value="User" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="590" y="50" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="16" value="Long" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="590" y="30" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="17" value="remove expense" style="ellipse;whiteSpace=wrap;html=1;fillColor=#fa6800;fontColor=#000000;strokeColor=#C73500;" parent="1" vertex="1">
<mxGeometry x="670" y="190" width="90" height="50" as="geometry"/>
</mxCell>
<mxCell id="19" style="edgeStyle=none;html=1;" parent="1" source="18" target="5" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="20" style="edgeStyle=none;html=1;entryX=0;entryY=1;entryDx=0;entryDy=0;" parent="1" source="18" target="17" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="22" style="edgeStyle=none;html=1;" parent="1" source="18" target="21" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="24" style="edgeStyle=none;html=1;" parent="1" source="18" target="23" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="26" style="edgeStyle=none;html=1;entryX=1;entryY=1;entryDx=0;entryDy=0;" parent="1" source="18" target="25" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="28" style="edgeStyle=none;html=1;" parent="1" source="18" target="27" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="18" value="ExpenseList" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#647687;fontColor=#ffffff;strokeColor=#314354;" parent="1" vertex="1">
<mxGeometry x="540" y="270" width="120" height="60" as="geometry"/>
</mxCell>
<mxCell id="21" value="add User" style="ellipse;whiteSpace=wrap;html=1;fillColor=#fa6800;fontColor=#000000;strokeColor=#C73500;" parent="1" vertex="1">
<mxGeometry x="740" y="270" width="90" height="50" as="geometry"/>
</mxCell>
<mxCell id="23" value="remove User" style="ellipse;whiteSpace=wrap;html=1;fillColor=#fa6800;fontColor=#000000;strokeColor=#C73500;" parent="1" vertex="1">
<mxGeometry x="720" y="350" width="90" height="50" as="geometry"/>
</mxCell>
<mxCell id="25" value="update expense" style="ellipse;whiteSpace=wrap;html=1;fillColor=#fa6800;fontColor=#000000;strokeColor=#C73500;" parent="1" vertex="1">
<mxGeometry x="440" y="190" width="90" height="50" as="geometry"/>
</mxCell>
<mxCell id="27" value="update name" style="ellipse;whiteSpace=wrap;html=1;fillColor=#fa6800;fontColor=#000000;strokeColor=#C73500;" parent="1" vertex="1">
<mxGeometry x="380" y="275" width="90" height="50" as="geometry"/>
</mxCell>
<mxCell id="29" value="&lt;h1&gt;ExpenseList&lt;/h1&gt;&lt;div&gt;ExpenseList:&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;- create a List&lt;/div&gt;&lt;div&gt;- share a List&lt;/div&gt;&lt;div&gt;- handle Expenses&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;Expense:&lt;/div&gt;&lt;div&gt;- create a new Expense&lt;/div&gt;&lt;div&gt;- update an Expense&lt;/div&gt;&lt;div&gt;- delete an Expense&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;User:&lt;br&gt;- add User&lt;/div&gt;&lt;div&gt;-&amp;nbsp;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&amp;nbsp;&lt;/div&gt;" style="text;html=1;strokeColor=none;fillColor=none;spacing=5;spacingTop=-20;whiteSpace=wrap;overflow=hidden;rounded=0;" parent="1" vertex="1">
<mxGeometry x="20" y="10" width="190" height="270" as="geometry"/>
</mxCell>
<mxCell id="30" value="Expense" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#647687;fontColor=#ffffff;strokeColor=#314354;" parent="1" vertex="1">
<mxGeometry x="370" y="510" width="120" height="60" as="geometry"/>
</mxCell>
<mxCell id="31" value="id" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="480" y="480" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="32" value="owner" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="480" y="500" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="33" value="name" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="480" y="520" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="34" value="amount" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="480" y="540" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="35" value="deviation" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="480" y="560" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="36" value="Double" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="600" y="540" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="37" value="Double" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="600" y="560" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="38" value="String" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="600" y="520" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="39" value="User" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="600" y="500" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="40" value="Long" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="600" y="480" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="41" value="date" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="480" y="580" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="42" value="Time" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="600" y="580" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="43" value="expenseList" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="480" y="600" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="44" value="ExpenseList" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="600" y="600" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="45" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="900" y="40" width="200" height="320" as="geometry"/>
</mxCell>
<mxCell id="46" value="ExpenseList" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="910" y="50" width="120" height="40" as="geometry"/>
</mxCell>
<mxCell id="47" value="ExpenseList" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="910" y="100" width="120" height="40" as="geometry"/>
</mxCell>
<mxCell id="48" value="+" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="910" y="150" width="30" height="30" as="geometry"/>
</mxCell>
<mxCell id="50" value="Home" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
<mxGeometry x="970" y="10" width="60" height="30" as="geometry"/>
</mxCell>
<mxCell id="51" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="1140" y="40" width="200" height="320" as="geometry"/>
</mxCell>
<mxCell id="52" value="ExpenseList" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="1180" y="50" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="53" value="&lt;font style=&quot;font-size: 8px;&quot;&gt;24.12.24 ; Expense ; 24,12 €&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="1150" y="90" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="54" value="+" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="1300" y="285" width="30" height="30" as="geometry"/>
</mxCell>
<mxCell id="55" value="ExpenseList" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
<mxGeometry x="1210" y="10" width="60" height="30" as="geometry"/>
</mxCell>
<mxCell id="58" value="&lt;span style=&quot;color: rgb(255, 255, 255); font-size: 8px;&quot;&gt;24.12.24 ; Expense ; 24,12 €&lt;/span&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="1210" y="115" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="59" value="&lt;span style=&quot;font-size: 8px;&quot;&gt;24.12.24 ; Expense ; 24,12 €&lt;/span&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="1150" y="140" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="60" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="1390" y="40" width="200" height="320" as="geometry"/>
</mxCell>
<mxCell id="61" value="ExpenseList" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="1430" y="50" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="62" value="&lt;font style=&quot;font-size: 8px;&quot;&gt;24.12.24 ; Expense ; 24,12 €&lt;/font&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="1430" y="80" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="63" value="+" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="1540" y="320" width="30" height="30" as="geometry"/>
</mxCell>
<mxCell id="64" value="Update Expense" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
<mxGeometry x="1430" y="10" width="120" height="30" as="geometry"/>
</mxCell>
<mxCell id="67" value="&lt;span style=&quot;font-size: 8px;&quot;&gt;Amount : 24,12 €&lt;br&gt;Title: Expense&lt;br&gt;Date: 24.12.24&lt;br&gt;From: Jessi&lt;br&gt;Deviation: 0 €&lt;/span&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;align=left;spacingLeft=12;" parent="1" vertex="1">
<mxGeometry x="1405" y="110" width="170" height="80" as="geometry"/>
</mxCell>
<mxCell id="68" value="&lt;span style=&quot;color: rgb(255, 255, 255); font-size: 8px;&quot;&gt;Total: 24,12 €&lt;/span&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="1150" y="290" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="70" value="" style="endArrow=none;html=1;fontSize=8;entryX=1;entryY=0.75;entryDx=0;entryDy=0;" parent="1" edge="1">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="1140" y="325" as="sourcePoint"/>
<mxPoint x="1340" y="325" as="targetPoint"/>
</mxGeometry>
</mxCell>
<mxCell id="72" value="&lt;span style=&quot;color: rgb(255, 255, 255); font-size: 8px;&quot;&gt;24.12.24 ; Expense ; 24,12 €&lt;/span&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
<mxGeometry x="1460" y="200" width="120" height="20" as="geometry"/>
</mxCell>
<mxCell id="73" value="&lt;span style=&quot;font-size: 8px;&quot;&gt;24.12.24 ; Expense ; 24,12 €&lt;/span&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
<mxGeometry x="1399" y="226" width="120" height="20" as="geometry"/>
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>

38
src/main/java/de/zendric/app/XpenselyServer/controller/ExpenseListController.java
View File

@@ -1,38 +0,0 @@
package de.zendric.app.XpenselyServer.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import de.zendric.app.XpenselyServer.model.ExpenseList;
import de.zendric.app.XpenselyServer.services.ExpenseListService;
@RestController
@RequestMapping("/api/lists")
public class ExpenseListController {
@Autowired
private ExpenseListService service;
@GetMapping
public List<ExpenseList> getAllLists() {
return service.getAllLists();
}
@PostMapping
public ExpenseList createList(@RequestBody ExpenseList list) {
return service.createList(list);
}
@DeleteMapping("/{id}")
public void deleteList(@PathVariable Long id) {
service.deleteList(id);
}
}

26
src/main/java/de/zendric/app/XpenselyServer/model/Expense.java
View File

@@ -1,26 +0,0 @@
package de.zendric.app.XpenselyServer.model;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Entity
public class Expense {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String description;
private Double amount;
@ManyToOne
private ExpenseList expenseList;
}

19
src/main/java/de/zendric/app/XpenselyServer/security/SecurityConfig.java
View File

@@ -1,19 +0,0 @@
package de.zendric.app.XpenselyServer.security;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.web.SecurityFilterChain;
@Configuration
public class SecurityConfig {
@Bean
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
http
.csrf().disable() // Disable CSRF for testing
.authorizeHttpRequests()
.anyRequest().permitAll(); // Allow all requests
return http.build();
}
}

27
src/main/java/de/zendric/app/XpenselyServer/services/ExpenseListService.java
View File

@@ -1,27 +0,0 @@
package de.zendric.app.XpenselyServer.services;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import de.zendric.app.XpenselyServer.model.ExpenseList;
import de.zendric.app.XpenselyServer.repo.ExpenseListRepository;
@Service
public class ExpenseListService {
@Autowired
private ExpenseListRepository repository;
public List<ExpenseList> getAllLists() {
return repository.findAll();
}
public ExpenseList createList(ExpenseList list) {
return repository.save(list);
}
public void deleteList(Long id) {
repository.deleteById(id);
}
}

2
src/main/java/de/zendric/app/XpenselyServer/XpenselyServerApplication.java → src/main/java/de/zendric/app/xpensely_server/XpenselyServerApplication.java
View File

@@ -1,4 +1,4 @@
package de.zendric.app.XpenselyServer; package de.zendric.app.xpensely_server;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;

36
src/main/java/de/zendric/app/XpenselyServer/controller/AppUserController.java → src/main/java/de/zendric/app/xpensely_server/controller/AppUserController.java
View File

@@ -1,4 +1,4 @@
package de.zendric.app.XpenselyServer.controller; package de.zendric.app.xpensely_server.controller;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@@ -11,35 +11,39 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import de.zendric.app.XpenselyServer.model.AppUser; import de.zendric.app.xpensely_server.model.AppUser;
import de.zendric.app.XpenselyServer.services.UserService; import de.zendric.app.xpensely_server.services.UserService;
@RestController @RestController
@RequestMapping("/api/users") @RequestMapping("/api/users")
public class AppUserController { public class AppUserController {
private UserService userService; private UserService userService;
@Autowired @Autowired
public AppUserController(UserService userService){ public AppUserController(UserService userService) {
this.userService= userService; this.userService = userService;
} }
@GetMapping @GetMapping
public AppUser getUser(@RequestParam Long id){ public AppUser getUser(@RequestParam Long id) {
return userService.getUser(id); return userService.getUser(id);
} }
@PostMapping @GetMapping("/byName")
public ResponseEntity<AppUser> createUser(@RequestBody AppUser user){ public AppUser getUserByName(@RequestParam String username) {
AppUser appUser = userService.createUser(user); return userService.getUserByName(username);
return ResponseEntity.status(HttpStatus.CREATED).body(appUser);
} }
@PostMapping
public ResponseEntity<AppUser> createUser(@RequestBody AppUser user) {
AppUser appUser = userService.createUser(user);
return ResponseEntity.status(HttpStatus.CREATED).body(appUser);
}
@DeleteMapping @DeleteMapping
public String deleteUser(@RequestParam Long id){ public String deleteUser(@RequestParam Long id) {
AppUser user = userService.deleteUserById(id); AppUser user = userService.deleteUserById(id);
return "User deleted : "+ user.getUsername(); return "User deleted : " + user.getUsername();
} }
} }

132
src/main/java/de/zendric/app/xpensely_server/controller/ExpenseListController.java Normal file
View File

@@ -0,0 +1,132 @@
package de.zendric.app.xpensely_server.controller;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import de.zendric.app.xpensely_server.model.Expense;
import de.zendric.app.xpensely_server.model.ExpenseList;
import de.zendric.app.xpensely_server.services.ExpenseListService;
@RestController
@RequestMapping("/api/expenselist")
class ExpenseListController {
private ExpenseListService expenseListService;
@Autowired
public ExpenseListController(ExpenseListService expenseListService) {
this.expenseListService = expenseListService;
}
@GetMapping("/all")
public ResponseEntity<List<ExpenseList>> getAll() {
try {
List<ExpenseList> items = new ArrayList<>();
expenseListService.findAll().forEach(items::add);
if (items.isEmpty())
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
return new ResponseEntity<>(items, HttpStatus.OK);
} catch (Exception e) {
return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
@GetMapping("/byUser")
public ResponseEntity<List<ExpenseList>> getByUser(@RequestParam Long userId) {
try {
List<ExpenseList> items = expenseListService.findByUserId(userId);
if (items.isEmpty())
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
return new ResponseEntity<>(items, HttpStatus.OK);
} catch (Exception e) {
return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
@GetMapping("/byUsername")
public ResponseEntity<List<ExpenseList>> getByUser(@RequestParam String username) {
try {
List<ExpenseList> items = expenseListService.findByUsername(username);
if (items.isEmpty())
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
return new ResponseEntity<>(items, HttpStatus.OK);
} catch (Exception e) {
return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
@GetMapping("/byId")
public ResponseEntity<ExpenseList> getById(@RequestParam Long id) {
Optional<ExpenseList> existingItemOptional = expenseListService.findById(id);
if (existingItemOptional.isPresent()) {
return new ResponseEntity<>(existingItemOptional.get(), HttpStatus.OK);
} else {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
}
}
@PostMapping
public ResponseEntity<ExpenseList> create(@RequestBody ExpenseList expenseList) {
try {
ExpenseList savedItem = (ExpenseList) expenseListService.save(expenseList);
return new ResponseEntity<>(savedItem, HttpStatus.CREATED);
} catch (Exception e) {
return new ResponseEntity<>(null, HttpStatus.EXPECTATION_FAILED);
}
}
@DeleteMapping("{id}")
public ResponseEntity<HttpStatus> delete(@PathVariable("id") Long id) {
try {
expenseListService.deleteById(id);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
} catch (Exception e) {
return new ResponseEntity<>(HttpStatus.EXPECTATION_FAILED);
}
}
@PostMapping("/{id}/add")
public ResponseEntity<Expense> addExpenseToList(
@PathVariable("id") Long expenseListId,
@RequestBody Expense expense) {
try {
Expense addedExpense = expenseListService.addExpenseToList(expenseListId, expense);
return new ResponseEntity<>(addedExpense, HttpStatus.CREATED);
} catch (Exception e) {
return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
@DeleteMapping("/{id}/delete")
public ResponseEntity<Expense> deleteExpenseFromList(
@PathVariable("id") Long expenseListId,
@RequestParam("expenseId") Long expenseId) {
try {
expenseListService.deleteExpenseFromList(expenseListId, expenseId);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
} catch (Exception e) {
return new ResponseEntity<>(null, HttpStatus.EXPECTATION_FAILED);
}
}
}

10
src/main/java/de/zendric/app/XpenselyServer/model/AppUser.java → src/main/java/de/zendric/app/xpensely_server/model/AppUser.java
View File

@@ -1,26 +1,24 @@
package de.zendric.app.XpenselyServer.model; package de.zendric.app.xpensely_server.model;
import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType; import jakarta.persistence.GenerationType;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
@Entity
@Getter @Getter
@Setter @Setter
@AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@Entity
public class AppUser { public class AppUser {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id; private Long id;
@Column(name = "username", nullable = false, unique = true)
private String username; private String username;
private String password;
private String email;
} }

43
src/main/java/de/zendric/app/xpensely_server/model/Expense.java Normal file
View File

@@ -0,0 +1,43 @@
package de.zendric.app.xpensely_server.model;
import java.time.LocalDate;
import com.fasterxml.jackson.annotation.JsonBackReference;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@Entity
@AllArgsConstructor
@NoArgsConstructor
public class Expense {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String title;
@ManyToOne
private AppUser owner;
private Double amount;
private Double deviation;
private LocalDate date;
@ManyToOne
@JoinColumn(name = "expense_list_id", nullable = false)
@JsonBackReference
private ExpenseList expenseList;
}

24
src/main/java/de/zendric/app/XpenselyServer/model/ExpenseList.java → src/main/java/de/zendric/app/xpensely_server/model/ExpenseList.java
View File

@@ -1,7 +1,9 @@
package de.zendric.app.XpenselyServer.model; package de.zendric.app.xpensely_server.model;
import java.util.List; import java.util.List;
import com.fasterxml.jackson.annotation.JsonManagedReference;
import jakarta.persistence.CascadeType; import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
@@ -10,17 +12,21 @@ import jakarta.persistence.Id;
import jakarta.persistence.ManyToMany; import jakarta.persistence.ManyToMany;
import jakarta.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany; import jakarta.persistence.OneToMany;
import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
@Entity @Entity
@Getter @Getter
@Setter @Setter
@AllArgsConstructor
@NoArgsConstructor
public class ExpenseList { public class ExpenseList {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id; private Long id;
private String name; private String name;
@ManyToOne @ManyToOne
@@ -29,6 +35,18 @@ public class ExpenseList {
@ManyToMany @ManyToMany
private List<AppUser> sharedWith; private List<AppUser> sharedWith;
@OneToMany(mappedBy = "expenseList", cascade = CascadeType.ALL) @OneToMany(mappedBy = "expenseList", cascade = CascadeType.ALL, orphanRemoval = true)
@JsonManagedReference
private List<Expense> expenses; private List<Expense> expenses;
public void addExpense(Expense expense) {
expense.setExpenseList(this);
expenses.add(expense);
}
public void removeExpense(Expense expense) {
expenses.remove(expense);
expense.setExpenseList(null);
}
} }

12
src/main/java/de/zendric/app/XpenselyServer/repo/ExpenseListRepository.java → src/main/java/de/zendric/app/xpensely_server/repo/ExpenseListRepository.java
View File

@@ -1,11 +1,13 @@
package de.zendric.app.XpenselyServer.repo; package de.zendric.app.xpensely_server.repo;
import org.springframework.data.jpa.repository.JpaRepository;
import de.zendric.app.XpenselyServer.model.ExpenseList;
import java.util.List; import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import de.zendric.app.xpensely_server.model.ExpenseList;
@Repository
public interface ExpenseListRepository extends JpaRepository<ExpenseList, Long> { public interface ExpenseListRepository extends JpaRepository<ExpenseList, Long> {
List<ExpenseList> findByOwnerId(Long ownerId); List<ExpenseList> findByOwnerId(Long ownerId);
} }

7
src/main/java/de/zendric/app/XpenselyServer/repo/ExpenseRepository.java → src/main/java/de/zendric/app/xpensely_server/repo/ExpenseRepository.java
View File

@@ -1,9 +1,10 @@
package de.zendric.app.XpenselyServer.repo; package de.zendric.app.xpensely_server.repo;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import de.zendric.app.XpenselyServer.model.Expense; import de.zendric.app.xpensely_server.model.Expense;
@Repository @Repository
public interface ExpenseRepository extends JpaRepository<Expense, Long> {} public interface ExpenseRepository extends JpaRepository<Expense, Long> {
}

10
src/main/java/de/zendric/app/XpenselyServer/repo/UserRepository.java → src/main/java/de/zendric/app/xpensely_server/repo/UserRepository.java
View File

@@ -1,9 +1,13 @@
package de.zendric.app.XpenselyServer.repo; package de.zendric.app.xpensely_server.repo;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import de.zendric.app.XpenselyServer.model.AppUser; import de.zendric.app.xpensely_server.model.AppUser;
@Repository @Repository
public interface UserRepository extends JpaRepository<AppUser, Long> {} public interface UserRepository extends JpaRepository<AppUser, Long> {
Optional<AppUser> findByUsername(String username);
}

32
src/main/java/de/zendric/app/xpensely_server/security/SecurityConfig.java Normal file
View File

@@ -0,0 +1,32 @@
package de.zendric.app.xpensely_server.security;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.web.SecurityFilterChain;
@Configuration
public class SecurityConfig {
@Bean
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
http
.authorizeHttpRequests(authorize -> authorize
.anyRequest().permitAll() // Allow all requests without authentication
)
.csrf().disable(); // Disable CSRF for development purposes
return http.build();
}
// @Bean
// public SecurityFilterChain securityFilterChain(HttpSecurity http) throws
// Exception {
// return http.authorizeHttpRequests(auth -> {
// auth.requestMatchers("/").permitAll();
// auth.anyRequest().permitAll();
// // auth.anyRequest().authenticated();
// }).oauth2Login(Customizer.withDefaults())
// .build();
// }
}

137
src/main/java/de/zendric/app/xpensely_server/services/ExpenseListService.java Normal file
View File

@@ -0,0 +1,137 @@
package de.zendric.app.xpensely_server.services;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import de.zendric.app.xpensely_server.model.AppUser;
import de.zendric.app.xpensely_server.model.Expense;
import de.zendric.app.xpensely_server.model.ExpenseList;
import de.zendric.app.xpensely_server.repo.ExpenseListRepository;
import de.zendric.app.xpensely_server.repo.ExpenseRepository;
import jakarta.persistence.EntityManager;
@Service
@Transactional
public class ExpenseListService {
private ExpenseListRepository repository;
private final ExpenseRepository expenseRepository;
@Autowired
private EntityManager entityManager;
@Autowired
public ExpenseListService(ExpenseListRepository repository, ExpenseRepository expenseRepository) {
this.repository = repository;
this.expenseRepository = expenseRepository;
}
public List<ExpenseList> getAllLists() {
return repository.findAll();
}
public ExpenseList createList(ExpenseList list) {
return repository.save(list);
}
public void deleteList(Long id) {
repository.deleteById(id);
}
public void deleteById(Long id) {
repository.deleteById(id);
}
public Optional<ExpenseList> findById(Long id) {
return repository.findById(id);
}
public Iterable<ExpenseList> findAll() {
return repository.findAll();
}
public ExpenseList save(ExpenseList expenseList) {
return repository.save(expenseList);
}
public List<ExpenseList> findByUserId(Long id) {
List<ExpenseList> allLists = repository.findAll();
List<ExpenseList> userSpecificList = new ArrayList<>();
for (ExpenseList expenseList : allLists) {
List<AppUser> sharedWith = expenseList.getSharedWith();
if (expenseList.getOwner().getId().equals(id)) {
userSpecificList.add(expenseList);
} else {
for (AppUser user : sharedWith) {
if (user.getId().equals(id)) {
userSpecificList.add(expenseList);
}
}
}
}
return userSpecificList;
}
public List<ExpenseList> findByUsername(String username) {
List<ExpenseList> allLists = repository.findAll();
List<ExpenseList> userSpecificList = new ArrayList<>();
for (ExpenseList expenseList : allLists) {
List<AppUser> sharedWith = expenseList.getSharedWith();
if (expenseList.getOwner().getUsername().equals(username)) {
userSpecificList.add(expenseList);
} else {
for (AppUser user : sharedWith) {
if (user.getUsername().equals(username)) {
userSpecificList.add(expenseList);
}
}
}
}
return userSpecificList;
}
public Expense addExpenseToList(Long expenseListId, Expense expense) {
ExpenseList expenseList = repository.findById(expenseListId)
.orElseThrow(() -> new RuntimeException("ExpenseList not found with id: " + expenseListId));
HashSet<Long> existingId = new HashSet<>();
for (Expense e : expenseList.getExpenses()) {
existingId.add(e.getId());
}
expenseList.addExpense(expense);
repository.save(expenseList);
Expense newExpense = expense;
for (Expense e : expenseList.getExpenses()) {
if (!existingId.contains(e.getId())) {
newExpense = e;
break;
}
}
return newExpense;
}
public void deleteExpenseFromList(Long expenseListId, Long expenseId) {
ExpenseList expenseList = repository.findById(expenseListId)
.orElseThrow(() -> new RuntimeException("ExpenseList not found with id: " + expenseListId));
Expense expenseToRemove = null;
for (Expense expense : expenseList.getExpenses()) {
if (expense.getId().equals(expenseId)) {
expenseToRemove = expense;
break;
}
}
if (expenseToRemove != null) {
expenseList.removeExpense(expenseToRemove);
} else {
throw new RuntimeException("Expense not found with id: " + expenseId);
}
repository.save(expenseList);
}
}

19
src/main/java/de/zendric/app/xpensely_server/services/ExpenseService.java Normal file
View File

@@ -0,0 +1,19 @@
package de.zendric.app.xpensely_server.services;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import de.zendric.app.xpensely_server.repo.ExpenseRepository;
@Service
@Transactional
public class ExpenseService {
@Autowired
private ExpenseRepository repository;
public ExpenseService(ExpenseRepository repository) {
this.repository = repository;
}
}

26
src/main/java/de/zendric/app/XpenselyServer/services/UserService.java → src/main/java/de/zendric/app/xpensely_server/services/UserService.java
View File

@@ -1,12 +1,12 @@
package de.zendric.app.XpenselyServer.services; package de.zendric.app.xpensely_server.services;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import de.zendric.app.XpenselyServer.model.AppUser; import de.zendric.app.xpensely_server.model.AppUser;
import de.zendric.app.XpenselyServer.repo.UserRepository; import de.zendric.app.xpensely_server.repo.UserRepository;
@Service @Service
public class UserService { public class UserService {
@@ -25,19 +25,27 @@ public class UserService {
} }
public AppUser getUser(Long id) { public AppUser getUser(Long id) {
Optional<AppUser> user= userRepository.findById(id); Optional<AppUser> user = userRepository.findById(id);
if (user.isPresent()) { if (user.isPresent()) {
return user.get(); return user.get();
} } else
else return null; return null;
} }
public AppUser deleteUserById(Long id) { public AppUser deleteUserById(Long id) {
Optional<AppUser> user= userRepository.findById(id); Optional<AppUser> user = userRepository.findById(id);
if (user.isPresent()) { if (user.isPresent()) {
userRepository.deleteById(id); userRepository.deleteById(id);
return user.get(); return user.get();
} } else
else return null; return null;
}
public AppUser getUserByName(String username) {
Optional<AppUser> optUser = userRepository.findByUsername(username);
if (optUser.isPresent()) {
return optUser.get();
} else
return null;
} }
} }

15
src/main/resources/application.properties
View File

@@ -1 +1,16 @@
#Server
spring.application.name=XpenselyServer spring.application.name=XpenselyServer
#Security
spring.security.enabled=false
#logging.level.org.springframework.security=TRACE
# PostgreSQL Configuration
spring.datasource.url=jdbc:postgresql://localhost:5432/Xpensely
spring.datasource.username=${XpenselyDBUser}
spring.datasource.password=${XpenselyDBPW}
spring.datasource.driver-class-name=org.postgresql.Driver
# Hibernate configuration
spring.jpa.hibernate.ddl-auto=update
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect

2
src/test/java/de/zendric/app/XpenselyServer/XpenselyServerApplicationTests.java → src/test/java/de/zendric/app/xpensely_Server/XpenselyServerApplicationTests.java
View File

@@ -1,4 +1,4 @@
package de.zendric.app.XpenselyServer; package de.zendric.app.xpensely_Server;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;