Added EmergencyContact entity and CRUD for it

README.md

@@ -47,6 +47,14 @@ Mention all related repos and projects.
 
 Guide users through getting your code up and running on their own system. In this section you can talk about:
 1. Installation process
+1.2 install [Docker](https://docs.docker.com/install/)
+1.3 install `docker-compose`
+  * with [pip](https://packaging.python.org/tutorials/installing-packages/): `pip install docker-compose`
+1.3  create and run docker images for all server dependencies (mysql for now):
+``` shell
+docker-compose -f etc/docker/docker-compose.yml up
+```
+
 2. Software dependencies
 3. Latest releases
 4. API references

api/build.gradle

@@ -21,13 +21,13 @@ dependencies {
     implementation 'org.flywaydb:flyway-core:6.3.2'
     implementation 'io.springfox:springfox-swagger2:2.9.2'
     implementation 'io.springfox:springfox-swagger-ui:2.9.2'
+    implementation 'org.modelmapper:modelmapper:2.3.6'
+    implementation 'org.apache.commons:commons-lang3:3.9'
 
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'mysql:mysql-connector-java'
 
-    testImplementation('org.springframework.boot:spring-boot-starter-test') {
-        exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
-    }
+    testImplementation('org.springframework.boot:spring-boot-starter-test')
     testImplementation 'org.springframework.security:spring-security-test'
 }
 

api/src/main/java/com/code4ro/nextdoor/core/dto/BaseEntityDto.java

@@ -0,0 +1,14 @@
+package com.code4ro.nextdoor.core.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+@Setter
+@Getter
+public class BaseEntityDto {
+    private UUID id;
+    private LocalDateTime creationDate;
+}

api/src/main/java/com/code4ro/nextdoor/core/service/MapperService.java

@@ -0,0 +1,13 @@
+package com.code4ro.nextdoor.core.service;
+
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+public interface MapperService {
+    <T> T map(Object source, Class<T> targetType);
+
+    <T> List<T> mapList(List<?> sourceList, Class<? extends T> targetClass);
+
+    <T> Page<T> mapPage(Page<?> sourcePage, Class<? extends T> targetClass);
+}

api/src/main/java/com/code4ro/nextdoor/core/service/impl/MapperServiceImpl.java

@@ -0,0 +1,83 @@
+package com.code4ro.nextdoor.core.service.impl;
+
+import com.code4ro.nextdoor.core.dto.BaseEntityDto;
+import com.code4ro.nextdoor.core.entity.BaseEntity;
+import com.code4ro.nextdoor.core.service.MapperService;
+import com.code4ro.nextdoor.emergency.contact.dto.EmergencyContactDto;
+import com.code4ro.nextdoor.emergency.contact.entity.EmergencyContact;
+import com.code4ro.nextdoor.group.dto.GroupDto;
+import com.code4ro.nextdoor.group.dto.GroupSecurityPolicyDto;
+import com.code4ro.nextdoor.group.entity.Group;
+import com.code4ro.nextdoor.group.entity.GroupSecurityPolicy;
+import org.modelmapper.AbstractConverter;
+import org.modelmapper.ModelMapper;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class MapperServiceImpl implements MapperService, ApplicationListener<ContextRefreshedEvent> {
+    private final ModelMapper modelMapper;
+
+    public MapperServiceImpl() {
+        this.modelMapper = new ModelMapper();
+
+        addCustomMappings();
+        addCustomTypeMaps();
+    }
+
+    private void addCustomMappings() {
+        modelMapper.createTypeMap(BaseEntity.class, BaseEntityDto.class)
+                .addMapping(BaseEntity::getId, BaseEntityDto::setId);
+        modelMapper.createTypeMap(BaseEntityDto.class, BaseEntity.class)
+                .addMapping(BaseEntityDto::getId, BaseEntity::setId);
+    }
+
+    private void addCustomTypeMaps() {
+        modelMapper.createTypeMap(Group.class, GroupDto.class)
+                .includeBase(BaseEntity.class, BaseEntityDto.class);
+
+        modelMapper.createTypeMap(GroupSecurityPolicy.class, GroupSecurityPolicyDto.class);
+
+        modelMapper.createTypeMap(EmergencyContact.class, EmergencyContactDto.class);
+        modelMapper.createTypeMap(EmergencyContactDto.class, EmergencyContact.class);
+    }
+
+    @Override
+    public <T> T map(final Object source, final Class<T> targetType) {
+        return source != null ? modelMapper.map(source, targetType) : null;
+    }
+
+    @Override
+    public <T> List<T> mapList(final List<?> sourceList, final Class<? extends T> targetClass) {
+        if (sourceList == null) {
+            return Collections.emptyList();
+        }
+
+        return sourceList.stream()
+                .map(listElement -> modelMapper.map(listElement, targetClass))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public <T> Page<T> mapPage(final Page<?> sourcePage, final Class<? extends T> targetClass) {
+        if (sourcePage == null) {
+            return Page.empty();
+        }
+
+        return sourcePage.map(pageElement -> modelMapper.map(pageElement, targetClass));
+    }
+
+    @Override
+    public void onApplicationEvent(final ContextRefreshedEvent event) {
+        final Collection<AbstractConverter> converters =
+                event.getApplicationContext().getBeansOfType(AbstractConverter.class).values();
+        converters.forEach(modelMapper::addConverter);
+    }
+}

api/src/main/java/com/code4ro/nextdoor/emergency/contact/service/impl/EmergencyContactServiceImpl.java

@@ -1,5 +1,6 @@
 package com.code4ro.nextdoor.emergency.contact.service.impl;
 
+import com.code4ro.nextdoor.core.service.MapperService;
 import com.code4ro.nextdoor.emergency.contact.dto.EmergencyContactDto;
 import com.code4ro.nextdoor.emergency.contact.entity.EmergencyContact;
 import com.code4ro.nextdoor.emergency.contact.repository.EmergencyContactRepository;
@@ -15,26 +16,28 @@
 public class EmergencyContactServiceImpl implements EmergencyContactService {
 
     private final EmergencyContactRepository emergencyContactRepository;
+    private final MapperService mapperService;
 
     @Autowired
-    public EmergencyContactServiceImpl(EmergencyContactRepository emergencyContactRepository) {
+    public EmergencyContactServiceImpl(EmergencyContactRepository emergencyContactRepository, MapperService mapperService) {
         this.emergencyContactRepository = emergencyContactRepository;
+        this.mapperService = mapperService;
     }
 
     @Override
     public EmergencyContactDto save(EmergencyContactDto emergencyContactDto) {
-        EmergencyContact emergencyContact = mapDtoToEntity(emergencyContactDto);
-        EmergencyContact emergencyContactDB = emergencyContactRepository.save(emergencyContact);
+        final EmergencyContact emergencyContact = mapperService.map(emergencyContactDto, EmergencyContact.class);
+        final EmergencyContact emergencyContactDB = emergencyContactRepository.save(emergencyContact);
 
-        return mapEntityToDto(emergencyContactDB);
+        return mapperService.map(emergencyContactDB, EmergencyContactDto.class);
     }
 
     @Override
     public EmergencyContactDto update(EmergencyContactDto emergencyContactDto) {
         return emergencyContactRepository.findById(UUID.fromString(emergencyContactDto.getId()))
             .map(emergencyContact -> updateEntityWithDataFromDto(emergencyContact, emergencyContactDto))
             .map(emergencyContactRepository::save)
-            .map(this::mapEntityToDto)
+            .map(emergencyContact -> mapperService.map(emergencyContact, EmergencyContactDto.class))
             .orElseGet(() -> save(emergencyContactDto));
     }
 
@@ -46,38 +49,17 @@ public void deleteById(String id) {
     @Override
     public Optional<EmergencyContactDto> findByUUID(String id) {
         return emergencyContactRepository.findById(UUID.fromString(id))
-            .map(this::mapEntityToDto);
+            .map(emergencyContact -> mapperService.map(emergencyContact, EmergencyContactDto.class));
     }
 
     @Override
     public List<EmergencyContactDto> findAll() {
         return emergencyContactRepository.findAll()
             .stream()
-            .map(this::mapEntityToDto)
+            .map(emergencyContact -> mapperService.map(emergencyContact, EmergencyContactDto.class))
             .collect(Collectors.toList());
     }
 
-    private EmergencyContact mapDtoToEntity(EmergencyContactDto emergencyContactDto) {
-        return EmergencyContact.builder()
-            .name(emergencyContactDto.getName())
-            .surname(emergencyContactDto.getSurname())
-            .address(emergencyContactDto.getAddress())
-            .email(emergencyContactDto.getEmail())
-            .telephoneNumber(emergencyContactDto.getTelephoneNumber())
-            .build();
-    }
-
-    private EmergencyContactDto mapEntityToDto(EmergencyContact emergencyContact) {
-        return EmergencyContactDto.builder()
-            .id(String.valueOf(emergencyContact.getId()))
-            .name(emergencyContact.getName())
-            .surname(emergencyContact.getSurname())
-            .address(emergencyContact.getAddress())
-            .email(emergencyContact.getEmail())
-            .telephoneNumber(emergencyContact.getTelephoneNumber())
-            .build();
-    }
-
     private EmergencyContact updateEntityWithDataFromDto(EmergencyContact emergencyContact, EmergencyContactDto emergencyContactDto) {
         emergencyContact.setAddress(emergencyContactDto.getAddress());
         emergencyContact.setEmail(emergencyContactDto.getEmail());

api/src/main/java/com/code4ro/nextdoor/group/controller/GroupController.java

@@ -0,0 +1,47 @@
+package com.code4ro.nextdoor.group.controller;
+
+import com.code4ro.nextdoor.group.dto.GroupCreateDto;
+import com.code4ro.nextdoor.group.dto.GroupDto;
+import com.code4ro.nextdoor.group.dto.GroupUpdateDto;
+import com.code4ro.nextdoor.group.service.GroupService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.UUID;
+
+@Api("Group Controller")
+@RestController
+@RequestMapping("/api/groups")
+public class GroupController {
+    private final GroupService groupService;
+
+    @Autowired
+    public GroupController(final GroupService groupService) {
+        this.groupService = groupService;
+    }
+
+    @ApiOperation("Create group")
+    @PostMapping
+    public ResponseEntity<GroupDto> create(@RequestBody final GroupCreateDto createDto) {
+        final GroupDto groupDto = groupService.create(createDto);
+        return ResponseEntity.ok(groupDto);
+    }
+
+    @ApiOperation("Update group")
+    @PutMapping("/{id}")
+    public ResponseEntity<GroupDto> update(@PathVariable("id") final UUID id,
+                                           @RequestBody final GroupUpdateDto updateDto) {
+        final GroupDto groupDto = groupService.update(id, updateDto);
+        return ResponseEntity.ok(groupDto);
+    }
+
+    @ApiOperation("Get group")
+    @GetMapping("/{id}")
+    public ResponseEntity<GroupDto> get(@PathVariable("id") final UUID id) {
+        final GroupDto groupDto = groupService.get(id);
+        return ResponseEntity.ok(groupDto);
+    }
+}

api/src/main/java/com/code4ro/nextdoor/group/dto/GroupCreateDto.java

@@ -0,0 +1,13 @@
+package com.code4ro.nextdoor.group.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class GroupCreateDto {
+    private GroupSecurityPolicyDto securityPolicy;
+    private String name;
+    private String description;
+    private Boolean open;
+}

api/src/main/java/com/code4ro/nextdoor/group/dto/GroupDto.java

@@ -0,0 +1,13 @@
+package com.code4ro.nextdoor.group.dto;
+
+import com.code4ro.nextdoor.core.dto.BaseEntityDto;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class GroupDto extends BaseEntityDto {
+    private String name;
+    private String description;
+    private Boolean open;
+}

api/src/main/java/com/code4ro/nextdoor/group/dto/GroupSecurityPolicyDto.java

@@ -0,0 +1,11 @@
+package com.code4ro.nextdoor.group.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class GroupSecurityPolicyDto {
+    private String question;
+    private String answer;
+}

api/src/main/java/com/code4ro/nextdoor/group/dto/GroupUpdateDto.java

@@ -0,0 +1,12 @@
+package com.code4ro.nextdoor.group.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class GroupUpdateDto {
+    private String name;
+    private String description;
+    private Boolean open;
+}

api/src/main/java/com/code4ro/nextdoor/group/entity/Group.java

@@ -0,0 +1,26 @@
+package com.code4ro.nextdoor.group.entity;
+
+
+import com.code4ro.nextdoor.core.entity.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+@Table(name = "groups")
+@Entity
+@Getter
+@Setter
+public class Group extends BaseEntity {
+    private String name;
+    private String description;
+    private Boolean open;
+    @Cascade(CascadeType.ALL)
+    @OneToOne(fetch = FetchType.LAZY)
+    private GroupSecurityPolicy securityPolicy;
+}

api/src/main/java/com/code4ro/nextdoor/group/entity/GroupSecurityPolicy.java

@@ -0,0 +1,19 @@
+package com.code4ro.nextdoor.group.entity;
+
+import com.code4ro.nextdoor.core.entity.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.persistence.Entity;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+@Entity
+public class GroupSecurityPolicy extends BaseEntity {
+    private String question;
+    private String answer;
+}

api/src/main/java/com/code4ro/nextdoor/group/repository/GroupRepository.java

@@ -0,0 +1,9 @@
+package com.code4ro.nextdoor.group.repository;
+
+import com.code4ro.nextdoor.group.entity.Group;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.UUID;
+
+public interface GroupRepository extends JpaRepository<Group, UUID> {
+}