Merge pull request #563 from ita-social-projects/develop

fields for user, response statuses

src/main/java/com/softserveinc/dokazovi/controller/UserController.java

@@ -148,6 +148,9 @@ public ResponseEntity<UserDTO> getExpertById(@PathVariable("userId") Integer use
 	@ApiOperation(value = "Get current user",
 			authorizations = {@Authorization(value = "Authorization")})
 	public ResponseEntity<UserDTO> getCurrentUser(@AuthenticationPrincipal UserPrincipal userPrincipal) {
+		if (userPrincipal == null) {
+			return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
+		}
 		UserDTO userDTO = userService.findExpertById(userPrincipal.getId());
 		return ResponseEntity
 				.status((userDTO != null) ? HttpStatus.OK : HttpStatus.NOT_FOUND)
@@ -247,6 +250,6 @@ public ResponseEntity<Collection<? extends GrantedAuthority>> getAuthorities(
 			authorities = userPrincipal.getAuthorities();
 		}
 		return ResponseEntity.status(authorities != null
-				? HttpStatus.OK : HttpStatus.NOT_FOUND).body(authorities);
+				? HttpStatus.OK : HttpStatus.FORBIDDEN).body(authorities);
 	}
 }

src/main/java/com/softserveinc/dokazovi/dto/post/PostDTO.java

@@ -31,7 +31,7 @@ public class PostDTO {
 	private PostTypeDTO type;
 	private String status;
 	private Set<OriginDTO> origins;
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd.MM.yyyy")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm dd.MM.yyyy")
 	private Timestamp createdAt;
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd.MM.yyyy")
 	private Timestamp modifiedAt;

src/main/java/com/softserveinc/dokazovi/dto/user/UserDTO.java

@@ -4,6 +4,7 @@
 import lombok.Builder;
 import lombok.Data;
 
+import java.sql.Timestamp;
 import java.util.Set;
 
 /**
@@ -30,7 +31,11 @@ public class UserDTO {
 
 	private String bio;
 
-	private String socialNetwork;
+	private String region;
+
+	private String city;
+
+	private Set<String> socialNetworks;
 
 	private Set<DirectionDTO> directions;
 
@@ -40,4 +45,7 @@ public class UserDTO {
 
 	private LatestUserPostDTO lastAddedPost;
 
+	private Timestamp createdAt;
+
+	private Timestamp editedAt;
 }

src/main/java/com/softserveinc/dokazovi/entity/DoctorEntity.java

@@ -51,9 +51,6 @@ public class DoctorEntity {
 	@Column(columnDefinition = "TEXT")
 	private String bio;
 
-	@Column(columnDefinition = "TEXT")
-	private String socialNetwork;
-
 	@ColumnDefault("1.0")
 	private Double promotionScale;
 

src/main/java/com/softserveinc/dokazovi/entity/UserEntity.java

@@ -11,7 +11,9 @@
 import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.CascadeType;
+import javax.persistence.CollectionTable;
 import javax.persistence.Column;
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -70,6 +72,21 @@ public class UserEntity {
 	@CreationTimestamp
 	private Timestamp createdAt;
 
+	private Timestamp editedAt;
+
+	private String region;
+
+	private String city;
+
+	@ElementCollection
+	@CollectionTable(
+			name = "users_social_networks",
+			joinColumns = @JoinColumn(name = "user_id"))
+	@Column(name = "link")
+	@EqualsAndHashCode.Exclude
+	@ToString.Exclude
+	private Set<String> socialNetworks;
+
 	@OneToMany(fetch = FetchType.EAGER, mappedBy = "user", cascade = CascadeType.ALL)
 	@EqualsAndHashCode.Exclude
 	@ToString.Exclude

src/main/java/com/softserveinc/dokazovi/repositories/UserRepository.java

@@ -80,8 +80,9 @@ public interface UserRepository extends JpaRepository<UserEntity, Integer> {
 	 * @return the resulting user entity page
 	 */
 	@Query(nativeQuery = true,
-			value = " SELECT U.* FROM DOCTORS D "
+			value = " SELECT U.*, SN.LINK FROM DOCTORS D "
 					+ "     JOIN USERS U ON U.USER_ID = D.USER_ID "
+					+ "     JOIN USERS_SOCIAL_NETWORKS SN ON D.USER_ID = SN.USER_ID"
 					+ " ORDER BY D.PROMOTION_LEVEL DESC, D.RATING DESC, "
 					+ "          U.LAST_NAME, U.FIRST_NAME ")
 	Page<UserEntity> findDoctorsProfiles(Pageable pageable);

src/main/java/com/softserveinc/dokazovi/service/impl/UserServiceImpl.java

@@ -21,6 +21,7 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.transaction.Transactional;
+import java.sql.Timestamp;
 import java.util.Set;
 import java.util.UUID;
 
@@ -232,6 +233,7 @@ public UserEntity update(UserEntity user) {
 		if (user != null) {
 			UserEntity oldUser = getById(user.getId());
 			if (oldUser != null) {
+				user.setEditedAt(new Timestamp(System.currentTimeMillis()));
 				return userRepository.save(user);
 			}
 		}

src/main/resources/db/migration/V25__add_column_editedAt_for_users_and_table_for_social_networks_and_move_data_add_region_column.sql

@@ -0,0 +1,21 @@
+alter table public.users
+    add column EDITED_AT timestamp;
+
+create table if not exists USERS_SOCIAL_NETWORKS(
+    user_id integer not null
+    constraint social_networks_user_id_fkey
+        references users,
+    link varchar
+);
+
+insert into USERS_SOCIAL_NETWORKS (user_id, link)
+select user_id, social_network from DOCTORS;
+
+alter table public.doctors
+    drop column social_network;
+
+alter table public.users
+    add column REGION varchar;
+
+alter table public.users
+    add column CITY varchar;

src/test/java/com/softserveinc/dokazovi/controller/UserControllerTest.java

@@ -330,7 +330,7 @@ void checkTokenTest() throws Exception {
 	void getAuthoritiesTestNotFound() throws Exception {
 		String uri = USER + USER_GET_AUTHORITIES;
 		when(userPrincipal.getAuthorities()).thenReturn(null);
-		mockMvc.perform(get(uri)).andExpect(status().isNotFound());
+		mockMvc.perform(get(uri)).andExpect(status().isForbidden());
 		Collection<? extends GrantedAuthority> actual = userPrincipal.getAuthorities();
 		Assertions.assertNull(actual);
 	}

src/test/java/com/softserveinc/dokazovi/service/impl/UserServiceImplTest.java

@@ -440,8 +440,10 @@ void updateUserEntityTest() {
 		UserEntity userEntity = userService.getById(1);
 		userEntity.setEmail(expectedEmail);
 		when(userRepository.save(any(UserEntity.class))).thenReturn(expected);
+		Assertions.assertNull(expected.getEditedAt());
 		UserEntity actual = userService.update(userEntity);
 		Assertions.assertEquals(expectedEmail, actual.getEmail());
+		Assertions.assertNotNull(actual.getEditedAt());
 	}
 
 	@Test