Skip to content

Commit b80840e

Browse files
Csaba79-coderCsaba79-coder
authored
Merge pull request #19 from Csaba79-coder/feature-test-comment-Csaba
Feature test comment csaba
2 parents 9dba345 + f5bfcd6 commit b80840e

File tree

81 files changed

+2285
-91
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2285
-91
lines changed

‎README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
### We plan to use our existing domain: csaba79coder.com
88

9+
## Basic setup
10+
11+
- See manual
12+
913
## Backend Dependencies
1014

1115
- Java Development Kit - JDK 17
@@ -21,7 +25,6 @@
2125
- MySQL
2226
- Spring Security
2327
- Log4j2
24-
- Validator
2528

2629
## Frontend Dependencies
2730

@@ -36,6 +39,7 @@
3639
- JUnit 5
3740
- Mockito
3841
- JUnit Jupiter
42+
- H2 Database (in memory database)
3943
- Spring Boot Test
4044
- Spring Boot Starter Test
4145
- Spring Boot Test Autoconfigure
@@ -59,11 +63,19 @@
5963

6064
## Future plan
6165

66+
- Improve test coverage (unit tests, integration tests, end-to-end tests)
6267
- Implement login form and Spring Security
6368
- Create separate table for roles (and set a list of roles to the users)
69+
- After roles are implemented, we plan to make a separate REST API & Thymeleaf for the user (now only admin implemented)
6470
- We plan to use our existing domain: csaba79coder.com
6571
- We plan to make registration with social media
6672
- We also plan to make a mobile app (and using google map's API there for the localization of the users)
73+
- Creating javadoc for the project
74+
75+
## Collaborations
76+
77+
- GitHub
78+
- Postman (sharing workspace)
6779

6880
# Created by:
6981

‎doc/database/data/litter_snap_address.sql

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
-- MySQL dump 10.13 Distrib 8.0.26, for Win64 (x86_64)
2+
--
3+
-- Host: localhost Database: litter_snap
4+
-- ------------------------------------------------------
5+
-- Server version 8.0.26
6+
7+
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
8+
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
9+
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
10+
/*!50503 SET NAMES utf8 */;
11+
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
12+
/*!40103 SET TIME_ZONE='+00:00' */;
13+
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
14+
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
15+
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
16+
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
17+
18+
--
19+
-- Table structure for table `address`
20+
--
21+
22+
DROP TABLE IF EXISTS `address`;
23+
/*!40101 SET @saved_cs_client = @@character_set_client */;
24+
/*!50503 SET character_set_client = utf8mb4 */;
25+
CREATE TABLE `address` (
26+
`id` binary(16) NOT NULL,
27+
`created_at` datetime NOT NULL,
28+
`created_by` binary(16) DEFAULT NULL,
29+
`updated_at` datetime NOT NULL,
30+
`updated_by` binary(16) DEFAULT NULL,
31+
`city` varchar(255) DEFAULT NULL,
32+
`country` varchar(255) DEFAULT NULL,
33+
`first_line` varchar(255) DEFAULT NULL,
34+
`post_code` varchar(255) DEFAULT NULL,
35+
PRIMARY KEY (`id`)
36+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
37+
/*!40101 SET character_set_client = @saved_cs_client */;
38+
39+
--
40+
-- Dumping data for table `address`
41+
--
42+
43+
LOCK TABLES `address` WRITE;
44+
/*!40000 ALTER TABLE `address` DISABLE KEYS */;
45+
INSERT INTO `address` VALUES (_binary '\07D²©EN[¶F\ÕðͧO','2023-06-01 21:41:27',_binary 'gr\Éܧ¾H&–:\ãvO\Ô\ç','2023-06-01 21:41:27',_binary '\ÛÕ€ž\çGՏ‡›¼‘X0 ','London','United Kingdom','London street 100','SE61PJ'),(_binary 'P$Z\á(K\"µ±—Ƈ\ï','2023-05-31 22:12:57',_binary 'gr\Éܧ¾H&–:\ãvO\Ô\ç','2023-05-31 22:12:57',_binary '\ÛÕ€ž\çGՏ‡›¼‘X0 ','Budakalasz','Hungary','Gerinc utca 2287/3','2011');
46+
/*!40000 ALTER TABLE `address` ENABLE KEYS */;
47+
UNLOCK TABLES;
48+
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
49+
50+
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
51+
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
52+
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
53+
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
54+
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
55+
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
56+
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
57+
58+
-- Dump completed on 2023-06-05 23:05:04

‎doc/database/data/litter_snap_litter.sql

Lines changed: 60 additions & 0 deletions
Large diffs are not rendered by default.

‎doc/database/data/litter_snap_litter_report.sql

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
-- MySQL dump 10.13 Distrib 8.0.26, for Win64 (x86_64)
2+
--
3+
-- Host: localhost Database: litter_snap
4+
-- ------------------------------------------------------
5+
-- Server version 8.0.26
6+
7+
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
8+
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
9+
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
10+
/*!50503 SET NAMES utf8 */;
11+
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
12+
/*!40103 SET TIME_ZONE='+00:00' */;
13+
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
14+
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
15+
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
16+
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
17+
18+
--
19+
-- Table structure for table `litter_report`
20+
--
21+
22+
DROP TABLE IF EXISTS `litter_report`;
23+
/*!40101 SET @saved_cs_client = @@character_set_client */;
24+
/*!50503 SET character_set_client = utf8mb4 */;
25+
CREATE TABLE `litter_report` (
26+
`id` binary(16) NOT NULL,
27+
`created_at` datetime NOT NULL,
28+
`created_by` binary(16) DEFAULT NULL,
29+
`updated_at` datetime NOT NULL,
30+
`updated_by` binary(16) DEFAULT NULL,
31+
`litter_id` binary(16) NOT NULL,
32+
PRIMARY KEY (`id`),
33+
KEY `FKsnq0llmm4ac9f9ioow90jgdue` (`litter_id`),
34+
CONSTRAINT `FKsnq0llmm4ac9f9ioow90jgdue` FOREIGN KEY (`litter_id`) REFERENCES `litter` (`id`)
35+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
36+
/*!40101 SET character_set_client = @saved_cs_client */;
37+
38+
--
39+
-- Dumping data for table `litter_report`
40+
--
41+
42+
LOCK TABLES `litter_report` WRITE;
43+
/*!40000 ALTER TABLE `litter_report` DISABLE KEYS */;
44+
/*!40000 ALTER TABLE `litter_report` ENABLE KEYS */;
45+
UNLOCK TABLES;
46+
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
47+
48+
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
49+
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
50+
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
51+
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
52+
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
53+
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
54+
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
55+
56+
-- Dump completed on 2023-06-05 23:05:04

‎doc/database/data/litter_snap_litter_snap_user.sql

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
-- MySQL dump 10.13 Distrib 8.0.26, for Win64 (x86_64)
2+
--
3+
-- Host: localhost Database: litter_snap
4+
-- ------------------------------------------------------
5+
-- Server version 8.0.26
6+
7+
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
8+
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
9+
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
10+
/*!50503 SET NAMES utf8 */;
11+
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
12+
/*!40103 SET TIME_ZONE='+00:00' */;
13+
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
14+
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
15+
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
16+
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
17+
18+
--
19+
-- Table structure for table `litter_snap_user`
20+
--
21+
22+
DROP TABLE IF EXISTS `litter_snap_user`;
23+
/*!40101 SET @saved_cs_client = @@character_set_client */;
24+
/*!50503 SET character_set_client = utf8mb4 */;
25+
CREATE TABLE `litter_snap_user` (
26+
`id` binary(16) NOT NULL,
27+
`created_at` datetime NOT NULL,
28+
`created_by` binary(16) DEFAULT NULL,
29+
`updated_at` datetime NOT NULL,
30+
`updated_by` binary(16) DEFAULT NULL,
31+
`email` varchar(255) NOT NULL,
32+
`first_name` varchar(255) NOT NULL,
33+
`password` varchar(255) NOT NULL,
34+
`role` varchar(255) NOT NULL,
35+
PRIMARY KEY (`id`),
36+
UNIQUE KEY `UK_nx81u918yqdb14h441ins1jgi` (`email`)
37+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
38+
/*!40101 SET character_set_client = @saved_cs_client */;
39+
40+
--
41+
-- Dumping data for table `litter_snap_user`
42+
--
43+
44+
LOCK TABLES `litter_snap_user` WRITE;
45+
/*!40000 ALTER TABLE `litter_snap_user` DISABLE KEYS */;
46+
INSERT INTO `litter_snap_user` VALUES (_binary '\rœ\n*UF¨°È§\ì\éý\æw','2023-06-01 19:14:05',_binary 'gr\Éܧ¾H&–:\ãvO\Ô\ç','2023-06-01 19:14:05',_binary '\ÛÕ€ž\çGՏ‡›¼‘X0 ','kevinzefi1999@gmail.com','Kevin','$2a$10$/cIu8c0qAr9MLB6OXo3r.umaOh392bDqHudwxfAjMnUiI1u6MJYG2','ROLE_USER'),(_binary '>¤4º~N)”ûôAÙ½lW','2023-05-29 20:59:15',_binary 'gr\Éܧ¾H&–:\ãvO\Ô\ç','2023-05-29 20:59:15',_binary '\ÛÕ€ž\çGՏ‡›¼‘X0 ','csabavadasz79@gmail.com','Csaba','$2a$10$IHGHLrIwDrapqOl9sAFXVeQZJNCw11P.QhzDoACnNVZInaM9EV4a2','ROLE_USER'),(_binary 'IÞ‰¯®ýHºŠ/ž\"9G\éž','2023-06-04 17:27:58',_binary 'gr\Éܧ¾H&–:\ãvO\Ô\ç','2023-06-04 17:27:58',_binary '\ÛÕ€ž\çGՏ‡›¼‘X0 ','test@testemail.com','Test','$2a$10$RVyObuY7eTQXYkoQV4he3O6GwxUjbAI3o3Ul0tNTLFbDvHIU8GVcK','ROLE_USER'),(_binary 'jĺ6‡BN_£¶öTl†','2023-06-01 19:13:00',_binary 'gr\Éܧ¾H&–:\ãvO\Ô\ç','2023-06-01 19:13:00',_binary '\ÛÕ€ž\çGՏ‡›¼‘X0 ','verejanvasile@gmail.com','Vasile','$2a$10$nN6jg4sEjhTZvhuZunSyt.n8DLaCQuOECbQf/bKCXwJJ/8vIfYqJu','ROLE_USER'),(_binary '¡\\!\ê\íAЀ‚+_Ýœ®\Í','2023-06-02 12:07:42',_binary 'gr\Éܧ¾H&–:\ãvO\Ô\ç','2023-06-02 12:07:42',_binary '\ÛÕ€ž\çGՏ‡›¼‘X0 ','eugene@gmail.com','Eugene','$2a$10$H/5j0TlgWVGB7fbxCXodo.3/dzK41Eo/NPPpb.8VikNOaOWU0QaLO','ROLE_USER'),(_binary '\Ø@¯:YEA±¾\àsqdˆ,G','2023-06-04 18:33:41',_binary 'gr\Éܧ¾H&–:\ãvO\Ô\ç','2023-06-04 18:33:41',_binary '\ÛÕ€ž\çGՏ‡›¼‘X0 ','regtest@gmail.com','RegistrationForm','$2a$10$M90LdTFXODRC3dsEITH2Q.Yle1ChFVwQzefzTHZjvRQRgfKA6PYIy','ROLE_USER'),(_binary 'ðž1ƒGœL^¨ fmQ®R‰','2023-06-04 18:42:59',_binary 'gr\Éܧ¾H&–:\ãvO\Ô\ç','2023-06-04 18:42:59',_binary '\ÛÕ€ž\çGՏ‡›¼‘X0 ','redirectlogin@gmail.com','RedirectToLoginAfterReg','$2a$10$Up7Dzc5idkyftAVE/2N0Lef3f.dBfiws2mpO/HuGkTb8kuyg8vARy','ROLE_USER'),(_binary 'ÿsÁ{A\ÌK—™sü\" Ô€õ','2023-06-05 20:28:28',_binary 'gr\Éܧ¾H&–:\ãvO\Ô\ç','2023-06-05 20:28:28',_binary '\ÛÕ€ž\çGՏ‡›¼‘X0 ','showvasile@test.com','TestForVasile','$2a$10$NugFZcqRsKItoiRMWFA37ud/e6ud6v31nDYt2Z/ydSgv5Zbwk6C1m','ROLE_USER');
47+
/*!40000 ALTER TABLE `litter_snap_user` ENABLE KEYS */;
48+
UNLOCK TABLES;
49+
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
50+
51+
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
52+
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
53+
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
54+
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
55+
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
56+
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
57+
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
58+
59+
-- Dump completed on 2023-06-05 23:05:04

‎doc/database/eerdiagram/litterSnapEerDiagram.png

51.7 KB
Loading

‎doc/database/script/litter_snap_database_create_script.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CREATE DATABASE litter_snap CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;

‎doc/mvp2-flowchart/class-diagram/address_model.png

32.3 KB
Loading

‎doc/mvp2-flowchart/class-diagram/controllers.png

181 KB
Loading

‎doc/mvp2-flowchart/class-diagram/entities.png

73.1 KB
Loading

‎doc/mvp2-flowchart/class-diagram/enums.png

77.3 KB
Loading

‎doc/mvp2-flowchart/class-diagram/litter_models.png

85.2 KB
Loading

‎doc/mvp2-flowchart/class-diagram/repositories.png

43.6 KB
Loading

‎doc/mvp2-flowchart/class-diagram/services.png

124 KB
Loading

‎doc/mvp2-flowchart/class-diagram/user_models.png

69.2 KB
Loading

‎doc/mvp2-flowchart/class-diagram/util_classes_static_methods.png

120 KB
Loading

‎doc/mvp2-flowchart/flowchart.jpg

436 KB
Loading

‎doc/mvp2-flowchart/litter-snap-mvp2-report.docx

390 KB
Binary file not shown.

0 commit comments

Comments
 (0)