From 0e637791ef20e73eec151308a8548ec94854bb58 Mon Sep 17 00:00:00 2001 From: Ismailov_Rovshan Date: Wed, 24 May 2023 17:19:18 +0400 Subject: [PATCH] =?UTF-8?q?5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5?= =?UTF-8?q?=D1=82=20(=D0=B3=D0=BE=D1=80=D0=BE=D0=B4=20=D0=B1=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20=D0=BE=D1=84=D0=BE=D1=80=D0=BC=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D1=82=D1=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 16 ++- data.mv.db | Bin 57344 -> 131072 bytes .../src/components/catalogs/CatalogUsers.jsx | 120 +++++++++++------- .../ru/ulstu/is/sbapp/WebConfiguration.java | 16 +++ .../controller/CommunityController.java | 5 +- .../controller/MusicController.java | 8 +- .../controller/UserController.java | 38 +++++- .../is/sbapp/socialNetwork/dto/UserDTO.java | 45 +++++-- .../sbapp/socialNetwork/models/UserModel.java | 4 + .../repository/UserRepository.java | 3 + .../services/CommunityService.java | 5 +- .../socialNetwork/services/UserService.java | 46 ++++++- .../ru/ulstu/is/sbapp/JpaCommunityTest.java | 18 +-- 13 files changed, 244 insertions(+), 80 deletions(-) diff --git a/build.gradle b/build.gradle index 482c489..b2eff23 100644 --- a/build.gradle +++ b/build.gradle @@ -14,12 +14,22 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-devtools' + implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect' + + implementation 'org.webjars:bootstrap:5.1.3' + implementation 'org.webjars:jquery:3.6.0' + implementation 'org.webjars:font-awesome:6.1.0' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'com.h2database:h2:2.1.210' - implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.5' - implementation 'org.hibernate.validator:hibernate-validator:7.0.1.Final' + implementation 'org.hibernate.validator:hibernate-validator' + + implementation 'org.springdoc:springdoc-openapi-ui:1.6.5' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' } tasks.named('test') { diff --git a/data.mv.db b/data.mv.db index cb6c6d519d6cc206cdf4c0ac41499548a9b3b8eb..b42c008b36872a2e8c4b1afa09c93fb348e2b315 100644 GIT binary patch literal 131072 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 D3Yys8 diff --git a/front/src/components/catalogs/CatalogUsers.jsx b/front/src/components/catalogs/CatalogUsers.jsx index 2fc4a7b..1e2c5a2 100644 --- a/front/src/components/catalogs/CatalogUsers.jsx +++ b/front/src/components/catalogs/CatalogUsers.jsx @@ -6,7 +6,8 @@ import DataService from "../../services/DataService" let headers = [ {label: "name", text: "Имя"}, {label: "music", text: "Музыка"}, - {label: "fullNames", text: "Группы"} + {label: "community", text: "Группы"}, + { label: "city", text: "Город" } ] export default function CatalogUsers() { const url = "/users"; @@ -14,7 +15,8 @@ export default function CatalogUsers() { const [data, setData] = useState({ name: "", music: [], - fullNames: [] + community: [], + city: "" }); const [selectedData, setSelectedData] = useState({ @@ -58,12 +60,12 @@ export default function CatalogUsers() { } function addCommunity() { - for(let a of data.fullNames) { + for(let a of data.community) { if(a == selectedData.community) return; } - let temp = data.fullNames.slice(0); + let temp = data.community.slice(0); temp.push(selectedData.community); - setData({...data, fullNames: temp}); + setData({...data, community: temp}); } function deleteMusic(e) { @@ -74,12 +76,12 @@ export default function CatalogUsers() { function deleteCommunity(e) { let communityName = e.target.previousSibling.textContent; - let temp = data.fullNames.filter(x => (x != communityName)); - setData({...data, fullNames: temp}) + let temp = data.community.filter(x => (x != communityName)); + setData({...data, community: temp}) } function onAdd() { - setData({name: "", music: [], fullNames: []}); + setData({name: "", music: [], community: []}); } @@ -96,50 +98,72 @@ export default function CatalogUsers() {
- - + +
- +
+ - { - data.music.map(value => ( -
- {value} - -
- )) - } -

- + {data.music.map(value => ( +
+ {value} + +
+ ))} - - { - data.fullNames.map(value => ( -
- {value} - -
- )) - }

- - + + + + {data.community.map(value => ( +
+ {value} + +
+ ))} +

+ + ) } \ No newline at end of file diff --git a/src/main/java/ru/ulstu/is/sbapp/WebConfiguration.java b/src/main/java/ru/ulstu/is/sbapp/WebConfiguration.java index 64d729a..1155aa3 100644 --- a/src/main/java/ru/ulstu/is/sbapp/WebConfiguration.java +++ b/src/main/java/ru/ulstu/is/sbapp/WebConfiguration.java @@ -2,6 +2,8 @@ package ru.ulstu.is.sbapp; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration @@ -10,4 +12,18 @@ public class WebConfiguration implements WebMvcConfigurer { public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**").allowedMethods("*"); } + public static final String REST_API = "/api"; + + @Override + public void addViewControllers(ViewControllerRegistry registry) { + WebMvcConfigurer.super.addViewControllers(registry); + registry.addViewController("users"); + registry.addViewController("contacts"); + registry.addViewController("catalogs"); + } + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("/static/css/**").addResourceLocations("/static/css/"); + } + } \ No newline at end of file diff --git a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/controller/CommunityController.java b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/controller/CommunityController.java index caaf422..38dee1a 100644 --- a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/controller/CommunityController.java +++ b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/controller/CommunityController.java @@ -1,6 +1,7 @@ package ru.ulstu.is.sbapp.socialNetwork.controller; import org.springframework.web.bind.annotation.*; +import ru.ulstu.is.sbapp.WebConfiguration; import ru.ulstu.is.sbapp.socialNetwork.dto.CommunityDTO; import ru.ulstu.is.sbapp.socialNetwork.services.CommunityService; @@ -8,7 +9,7 @@ import javax.validation.Valid; import java.util.List; @RestController -@RequestMapping("/communities") +@RequestMapping(WebConfiguration.REST_API + "/communities") public class CommunityController { private final CommunityService communityService; @@ -23,7 +24,7 @@ public class CommunityController { @GetMapping("") public List getCommunities() { - return communityService.findAllCommunitys().stream().map(CommunityDTO::new).toList(); + return communityService.findAllCommunities().stream().map(CommunityDTO::new).toList(); } @PostMapping("") diff --git a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/controller/MusicController.java b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/controller/MusicController.java index 5f7ec61..21e68dc 100644 --- a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/controller/MusicController.java +++ b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/controller/MusicController.java @@ -2,24 +2,30 @@ package ru.ulstu.is.sbapp.socialNetwork.controller; import org.springframework.web.bind.annotation.*; +import ru.ulstu.is.sbapp.WebConfiguration; import ru.ulstu.is.sbapp.socialNetwork.dto.MusicDTO; import ru.ulstu.is.sbapp.socialNetwork.models.Music; import ru.ulstu.is.sbapp.socialNetwork.services.MusicService; +import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; @RestController -@RequestMapping("/musics") +@RequestMapping(WebConfiguration.REST_API + "/musics") public class MusicController { + private final MusicService musicService; + public MusicController(MusicService musicService){ this.musicService = musicService; } + @GetMapping("/{id}") public MusicDTO getMusic(@PathVariable Long id){ return new MusicDTO(musicService.findMusic(id)); } + @GetMapping("") public List getMusics() { return musicService.findAllMusics().stream().map(MusicDTO::new).toList(); diff --git a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/controller/UserController.java b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/controller/UserController.java index f741075..a56a3fb 100644 --- a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/controller/UserController.java +++ b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/controller/UserController.java @@ -1,15 +1,18 @@ package ru.ulstu.is.sbapp.socialNetwork.controller; import org.springframework.web.bind.annotation.*; +import ru.ulstu.is.sbapp.WebConfiguration; import ru.ulstu.is.sbapp.socialNetwork.dto.UserDTO; import ru.ulstu.is.sbapp.socialNetwork.models.UserModel; import ru.ulstu.is.sbapp.socialNetwork.services.UserService; + import javax.validation.Valid; import java.util.List; + @RestController -@RequestMapping("/users") +@RequestMapping(WebConfiguration.REST_API + "/users") public class UserController { private final UserService userService; @@ -27,6 +30,39 @@ public class UserController { return userService.findAllUsers().stream().map(UserDTO::new).toList(); } + @PostMapping("") + public UserDTO createUser(@RequestBody @Valid UserDTO user) { + UserModel result = userService.addUser(user.getName(), user.getCity()); + userService.updateCommunities(result.getId(), user.getCommunity()); + return new UserDTO(userService.updateMusics(result.getId(), user.getMusic())); + } + @PatchMapping("/{id}") + public UserDTO updateUser(@PathVariable Long id, + @RequestBody @Valid UserDTO user) { + UserModel result = userService.updateUser(id, user.getName()); + userService.updateCommunities(result.getId(), user.getCommunity()); + return new UserDTO(userService.updateMusics(result.getId(), user.getMusic())); + } + + @PatchMapping("/add_music/{id}") + public UserDTO addMusic(@PathVariable Long id, @RequestParam Long music_id) { + return new UserDTO(userService.addMusic(id, music_id)); + } + + @PatchMapping("/add_community/{id}") + public UserDTO addCommunity(@PathVariable Long id, @RequestParam Long community_id) { + return new UserDTO(userService.addCommunity(id, community_id)); + } + @GetMapping("/search") + public List searchUsers(@RequestParam("city") String city) { + List users = userService.findUserByCity(city); + return users.stream().map(UserDTO::new).toList(); + } + + @DeleteMapping("/{id}") + public UserDTO deleteUser(@PathVariable Long id) { + return new UserDTO(userService.deleteUser(id)); + } } diff --git a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/dto/UserDTO.java b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/dto/UserDTO.java index aa24f2e..001a166 100644 --- a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/dto/UserDTO.java +++ b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/dto/UserDTO.java @@ -14,39 +14,61 @@ public class UserDTO { public UserDTO(){} public UserDTO(UserModel user){ + this.id = user.getId(); this.name = user.getName(); this.city = user.getCity(); + if(user.getMusics() != null) { + this.music = user.getMusics().stream().map(Music::getName).toList(); + } + if(user.getGroups() != null) { + this.community = user.getGroups().stream().map(Community::getName).toList(); + } } - private List musics; - private List communities; + public UserDTO(Long id, String name) { + this.id = id; + this.name = name; + } + private List music; + private List community; public Long getId(){return id;} public String getName(){return name;} public void setName(String firstName){this.name = firstName;} - public void addMusic(Music g) { - musics.add(g); - } - public List getMusics() { - return musics; + public List getMusic() { + return music; } - public void addCommunity(Community g) { - communities.add(g); + public List getCommunity() { + return community; } - public List getGroups() { - return communities; + + public void setCommunities(List communities) { + this.community = communities; + } + + public void setMusics(List musics) { + this.music = musics; } public void setCity(String city){ this.city = city; } + public String getCity(){ return city; } + public void setMusic(List music) { + this.music = music; + } + + public void setCommunity(List community) { + this.community = community; + } + @Override public String toString() { return "User{" + @@ -55,4 +77,5 @@ public class UserDTO { ", city='" + city + '\'' + '}'; } + } diff --git a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/models/UserModel.java b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/models/UserModel.java index 33c96d6..4cd934a 100644 --- a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/models/UserModel.java +++ b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/models/UserModel.java @@ -3,6 +3,7 @@ import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; import javax.persistence.*; +import java.util.ArrayList; import java.util.List; @Entity @@ -35,6 +36,7 @@ public class UserModel { } public UserModel(String name){ this.name = name; + this.city = "Mosscow"; } public UserModel(String name, String city){ this.name = name; @@ -53,6 +55,7 @@ public class UserModel { public void setName(String firstName){this.name = firstName;} public void addMusic(Music g) { + if(musics == null) musics = new ArrayList<>(); musics.add(g); } public List getMusics() { @@ -60,6 +63,7 @@ public class UserModel { } public void addCommunity(Community g) { + if(communities == null) communities = new ArrayList<>(); communities.add(g); } public List getGroups() { diff --git a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/repository/UserRepository.java b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/repository/UserRepository.java index bcc3cc9..af1876a 100644 --- a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/repository/UserRepository.java +++ b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/repository/UserRepository.java @@ -3,5 +3,8 @@ package ru.ulstu.is.sbapp.socialNetwork.repository; import org.springframework.data.jpa.repository.JpaRepository; import ru.ulstu.is.sbapp.socialNetwork.models.UserModel; +import java.util.List; + public interface UserRepository extends JpaRepository { + List findByCity(String city); } diff --git a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/services/CommunityService.java b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/services/CommunityService.java index 1f00286..9a5b5fe 100644 --- a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/services/CommunityService.java +++ b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/services/CommunityService.java @@ -40,10 +40,11 @@ public class CommunityService { } @Transactional(readOnly = true) - public List findAllCommunitys() { + public List findAllCommunities() { return repo.findAll(); } + @Transactional public Community updateCommunity(Long id, String name) { if (!StringUtils.hasText(name)) { @@ -79,7 +80,7 @@ public class CommunityService { } @Transactional - public void deleteAllCommunitys() { + public void deleteAllCommunities() { repo.deleteAll(); } diff --git a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/services/UserService.java b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/services/UserService.java index 6609800..a3facc9 100644 --- a/src/main/java/ru/ulstu/is/sbapp/socialNetwork/services/UserService.java +++ b/src/main/java/ru/ulstu/is/sbapp/socialNetwork/services/UserService.java @@ -9,6 +9,7 @@ import ru.ulstu.is.sbapp.socialNetwork.models.UserModel; import ru.ulstu.is.sbapp.socialNetwork.repository.UserRepository; import javax.persistence.EntityNotFoundException; +import javax.persistence.Query; import java.util.List; import java.util.Optional; @@ -34,12 +35,26 @@ public class UserService { UserModel user = new UserModel(name, city); return repo.save(user); } + @Transactional + public UserModel addUser(String name, String city, List musics, List communities) { + + if (!StringUtils.hasText(name)) { + throw new IllegalArgumentException("Name is null or empty"); + } + + UserModel user = new UserModel(name, city); + UserModel result = repo.save(user); + + updateMusics(result.getId(), musics); + return updateCommunities(user.getId(), communities); + } + @Transactional public UserModel addMusic(Long userId, Long musicId) { final Optional userOpt= repo.findById(userId); if (userOpt.isEmpty()) { - throw new EntityNotFoundException(String.format("Film with id [%s] is not found", musicId)); + throw new EntityNotFoundException(String.format("User with id [%s] is not found", musicId)); } UserModel user = userOpt.get(); @@ -83,11 +98,16 @@ public class UserService { // @Transactional(readOnly = true) // public List findUserByCity(String city){ -// Query query = em.createQuery("select u from UserModel u where u.city = :city", +// Query query = repo.createQuery("select u from UserModel u where u.city = :city", // UserModel.class).setParameter("city", city); // List result = query.getResultList(); -// return result; +// return result; // } + @Transactional(readOnly = true) + public List findUserByCity(String city){ + List result = repo.findByCity(city); + return result; + } @Transactional(readOnly = true) public List findAllUsers() { @@ -112,7 +132,27 @@ public class UserService { return repo.save(currentUser); } //update community, musics + @Transactional + public UserModel updateUser(Long id, String name,String city, List musics, List Communities) { + if (!StringUtils.hasText(name)) { + throw new IllegalArgumentException("User name is null or empty"); + } + final Optional currentUserOpt = repo.findById(id); + if(currentUserOpt.isEmpty()) { + return null; + } + + final UserModel currentUser = currentUserOpt.get(); + + currentUser.setName(name); + currentUser.setCity(city); + repo.save(currentUser); + + updateMusics(id, musics); + return updateCommunities(id, Communities); + } + @Transactional public UserModel updateCommunities(Long userId , List communities) { final Optional userOpt = repo.findById(userId); diff --git a/src/test/java/ru/ulstu/is/sbapp/JpaCommunityTest.java b/src/test/java/ru/ulstu/is/sbapp/JpaCommunityTest.java index b5d1d27..b5e3e4e 100644 --- a/src/test/java/ru/ulstu/is/sbapp/JpaCommunityTest.java +++ b/src/test/java/ru/ulstu/is/sbapp/JpaCommunityTest.java @@ -26,7 +26,7 @@ public class JpaCommunityTest { @Test void testUserCreate() { - communityService.deleteAllCommunitys(); + communityService.deleteAllCommunities(); final Community community = communityService.addCommunity("CodeGPT"); log.info(community.toString()); Assertions.assertNotNull(community.getId()); @@ -34,13 +34,13 @@ public class JpaCommunityTest { @Test void testUserReadNotFound() { - communityService.deleteAllCommunitys(); + communityService.deleteAllCommunities(); Assertions.assertThrows(EntityNotFoundException.class, () -> communityService.findCommunity(-1L)); } @Test void findUser() { - communityService.deleteAllCommunitys(); + communityService.deleteAllCommunities(); final Community community = communityService.addCommunity("CodeGPT"); log.info(community.toString()); final Community findCommunity = communityService.findCommunity(community.getId()); @@ -50,18 +50,18 @@ public class JpaCommunityTest { @Test void testReadAll() { - communityService.deleteAllCommunitys(); + communityService.deleteAllCommunities(); userService.deleteAllUsers(); final Community community = communityService.addCommunity("CodeGPT"); log.info(community.toString()); - final List communitys = communityService.findAllCommunitys(); - Assertions.assertEquals(communitys.size(), 1); + final List communities = communityService.findAllCommunities(); + Assertions.assertEquals(communities.size(), 1); } @Test void updateCommunity() { userService.deleteAllUsers(); - communityService.deleteAllCommunitys(); + communityService.deleteAllCommunities(); final Community community = communityService.addCommunity("CodeGPT 2"); communityService.updateCommunity(community.getId(), "CodeGPT 3"); final Community findCommunity = communityService.findCommunity(community.getId()); @@ -72,7 +72,7 @@ public class JpaCommunityTest { @Test void deleteCommunity() { userService.deleteAllUsers(); - communityService.deleteAllCommunitys(); + communityService.deleteAllCommunities(); final Community community = communityService.addCommunity("CodeGPT"); log.info(community.toString()); communityService.deleteCommunity(community.getId()); @@ -83,7 +83,7 @@ public class JpaCommunityTest { @Test void addUser() { userService.deleteAllUsers(); - communityService.deleteAllCommunitys(); + communityService.deleteAllCommunities(); userService.findAllUsers(); final Community community = communityService.addCommunity("CodeGPT"); final UserModel user = userService.addUser("its_mailov", "Moscow");