SpringBoot/FamilyCashCard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: SpringBoot:30aff2259ec43d8baded6d8a6f36519910a97b85
Branches Tags
SpringBoot:main
..
compare: SpringBoot:ca46b46029b9de514ff10ac4a299aa8127297ccd
Branches Tags
SpringBoot:main

No commits in common. "30aff2259ec43d8baded6d8a6f36519910a97b85" and "ca46b46029b9de514ff10ac4a299aa8127297ccd" have entirely different histories.
30aff2259e ... ca46b46029

9 changed files with 28 additions and 107 deletions
Show Stats Expand all files Collapse all files

2
build.gradle
View File

@ -21,8 +21,6 @@ dependencies {
implementation 'org.springframework.data:spring-data-jdbc'
testImplementation 'com.h2database:h2'
implementation 'org.springframework.boot:spring-boot-starter-security'
}
tasks.named('test') {

2
src/main/java/djmil/cashcard/CashCard.java
View File

@ -2,5 +2,5 @@ package djmil.cashcard;
import org.springframework.data.annotation.Id;
public record CashCard(@Id Long id, Double amount, String owner) {
public record CashCard(@Id Long id, Double amount) {
}

44
src/main/java/djmil/cashcard/SecurityConfig.java
View File

@ -1,44 +0,0 @@
package djmil.cashcard;
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.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
import org.springframework.security.web.SecurityFilterChain;
@Configuration
public class SecurityConfig {
@Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
http.authorizeHttpRequests()
.requestMatchers("/cashcards/**")
.authenticated()
.and()
.csrf().disable()
.httpBasic();
return http.build();
}
@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
@Bean
public UserDetailsService testOnlyUsers(PasswordEncoder passwordEncoder) {
User.UserBuilder users = User.builder();
UserDetails sarah = users
.username("sarah1")
.password(passwordEncoder.encode("abc123"))
.roles() // No roles for now
.build();
return new InMemoryUserDetailsManager(sarah);
}
}

19
src/test/java/djmil/cashcard/CashCardJsonTest.java
View File

@ -25,9 +25,9 @@ public class CashCardJsonTest {
@BeforeEach
void setUp() {
cashCards = Arrays.array(
new CashCard(99L, 123.45, "sarah1"),
new CashCard(100L, 1.00, "sarah1"),
new CashCard(101L, 150.00, "sarah1"));
new CashCard(99L, 123.45),
new CashCard(100L, 1.00),
new CashCard(101L, 150.00));
}
@Test
@ -37,7 +37,7 @@ public class CashCardJsonTest {
@Test
public void cashCardSerializationTest() throws IOException {
CashCard cashCard = new CashCard(99L, 123.45, "sarah1");
CashCard cashCard = new CashCard(99L, 123.45);
assertThat(json.write(cashCard)).isStrictlyEqualToJson("expected.json");
@ -55,12 +55,11 @@ public class CashCardJsonTest {
String expected = """
{
"id":1000,
"amount":67.89,
"owner": "sarah1"
"amount":67.89
}
""";
assertThat(json.parse(expected)).isEqualTo(new CashCard(1000L, 67.89, "sarah1"));
assertThat(json.parse(expected)).isEqualTo(new CashCard(1000L, 67.89));
assertThat(json.parseObject(expected).id()).isEqualTo(1000);
assertThat(json.parseObject(expected).amount()).isEqualTo(67.89);
@ -75,9 +74,9 @@ public class CashCardJsonTest {
void cashCardListDeserializationTest() throws IOException {
String expected="""
[
{ "id": 99, "amount": 123.45, "owner": "sarah1" },
{ "id": 100, "amount": 1.00, "owner": "sarah1" },
{ "id": 101, "amount": 150.00, "owner": "sarah1" }
{ "id": 99, "amount": 123.45 },
{ "id": 100, "amount": 1.00 },
{ "id": 101, "amount": 150.00 }
]
""";
assertThat(jsonList.parse(expected)).isEqualTo(cashCards);

50
src/test/java/djmil/cashcard/CashcardApplicationTests.java
View File

@ -31,9 +31,7 @@ class CashcardApplicationTests {
@Test
void shouldReturnACashCardWhenDataIsSaved() {
ResponseEntity<String> response = restTemplate
.withBasicAuth("sarah1", "abc123")
.getForEntity("/cashcards/99", String.class);
ResponseEntity<String> response = restTemplate.getForEntity("/cashcards/99", String.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
@ -48,9 +46,7 @@ class CashcardApplicationTests {
@Test
void shouldNotReturnACashCardWithAnUnknownId() {
ResponseEntity<String> response = restTemplate
.withBasicAuth("sarah1", "abc123")
.getForEntity("/cashcards/1000", String.class);
ResponseEntity<String> response = restTemplate.getForEntity("/cashcards/1000", String.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
assertThat(response.getBody()).isBlank();
@ -59,21 +55,16 @@ class CashcardApplicationTests {
@Test
@DirtiesContext
void shouldCreateANewCashCard() {
CashCard newCashCard = new CashCard(null, 250.00, "sarah1");
ResponseEntity<Void> createResponse = restTemplate
.withBasicAuth("sarah1", "abc123")
.postForEntity("/cashcards", newCashCard, Void.class );
CashCard newCashCard = new CashCard(null, 250.00);
ResponseEntity<Void> createResponse = restTemplate.postForEntity("/cashcards", newCashCard, Void.class );
assertThat(createResponse.getStatusCode()).isEqualTo(HttpStatus.CREATED);
// Validate created CashCard
URI locationOfNewCashCard = createResponse.getHeaders().getLocation();
ResponseEntity<String> getResponse = restTemplate
.withBasicAuth("sarah1", "abc123")
.getForEntity(locationOfNewCashCard, String.class);
ResponseEntity<String> getResponse = restTemplate.getForEntity(locationOfNewCashCard, String.class);
assertThat(getResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
// Validate created CashCard JSON
DocumentContext documentContext = JsonPath.parse(getResponse.getBody());
Number id = documentContext.read("$.id");
Double amount = documentContext.read("$.amount");
@ -84,9 +75,7 @@ class CashcardApplicationTests {
@Test
void shouldReturnAllCashCardsWhenListIsRequested() {
ResponseEntity<String> response = restTemplate
.withBasicAuth("sarah1", "abc123")
.getForEntity("/cashcards", String.class);
ResponseEntity<String> response = restTemplate.getForEntity("/cashcards", String.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
DocumentContext documentContext = JsonPath.parse(response.getBody());
@ -102,9 +91,7 @@ class CashcardApplicationTests {
@Test
void shouldReturnAPageOfCashCards() {
ResponseEntity<String> response = restTemplate
.withBasicAuth("sarah1", "abc123")
.getForEntity("/cashcards?page=0&size=1", String.class);
ResponseEntity<String> response = restTemplate.getForEntity("/cashcards?page=0&size=1", String.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
DocumentContext documentContext = JsonPath.parse(response.getBody());
@ -114,9 +101,7 @@ class CashcardApplicationTests {
@Test
void shouldReturnASortedPageOfCashCards() {
ResponseEntity<String> response = restTemplate
.withBasicAuth("sarah1", "abc123")
.getForEntity("/cashcards?page=0&size=1&sort=amount,desc", String.class);
ResponseEntity<String> response = restTemplate.getForEntity("/cashcards?page=0&size=1&sort=amount,desc", String.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
DocumentContext documentContext = JsonPath.parse(response.getBody());
@ -129,9 +114,7 @@ class CashcardApplicationTests {
@Test
void shouldReturnASortedPageOfCashCardsWithNoParametersAndUseDefaultValues() {
ResponseEntity<String> response = restTemplate
.withBasicAuth("sarah1", "abc123")
.getForEntity("/cashcards", String.class);
ResponseEntity<String> response = restTemplate.getForEntity("/cashcards", String.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
DocumentContext documentContext = JsonPath.parse(response.getBody());
@ -141,17 +124,4 @@ class CashcardApplicationTests {
JSONArray amounts = documentContext.read("$..amount");
assertThat(amounts).containsExactly(1.00, 123.45, 150.00);
}
@Test
void shouldNotReturnACashCardWhenUsingBadCredentials() {
ResponseEntity<String> response = restTemplate
.withBasicAuth("BAD-USER", "abc123")
.getForEntity("/cashcards/99", String.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
response = restTemplate
.withBasicAuth("sarah1", "BAD-PASSWORD")
.getForEntity("/cashcards/99", String.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
}
}

6
src/test/resources/data.sql
View File

@ -1,3 +1,3 @@
INSERT INTO CASH_CARD(ID, AMOUNT, OWNER) VALUES (99, 123.45, 'sarah1');
INSERT INTO CASH_CARD(ID, AMOUNT, OWNER) VALUES (100, 1.00, 'sarah1');
INSERT INTO CASH_CARD(ID, AMOUNT, OWNER) VALUES (101, 150.00, 'sarah1');
INSERT INTO CASH_CARD(ID, AMOUNT) VALUES (99, 123.45);
INSERT INTO CASH_CARD(ID, AMOUNT) VALUES (100, 1.00);
INSERT INTO CASH_CARD(ID, AMOUNT) VALUES (101, 150.00);

3
src/test/resources/djmil/cashcard/expected.json
View File

@ -1,5 +1,4 @@
{
"id": 99,
"amount": 123.45,
"owner": "sarah1"
"amount": 123.45
}

6
src/test/resources/djmil/cashcard/list.json
View File

@ -1,5 +1,5 @@
[
{ "id": 99, "amount": 123.45, "owner": "sarah1" },
{ "id": 100, "amount": 1.0, "owner": "sarah1" },
{ "id": 101, "amount": 150.0, "owner": "sarah1" }
{ "id": 99, "amount": 123.45 },
{ "id": 100, "amount": 1.0 },
{ "id": 101, "amount": 150.0 }
]

3
src/test/resources/schema.sql
View File

@ -1,6 +1,5 @@
CREATE TABLE cash_card
(
ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
AMOUNT NUMBER NOT NULL DEFAULT 0,
OWNER VARCHAR(256) NOT NULL
AMOUNT NUMBER NOT NULL DEFAULT 0
);