Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@ interface ProfileRepository : ReactiveCrudRepository<ProfileModel, Long> {
fun searchUsersBy(userId: String?, mobile: String?, email: String?, firstName: String?, lastName: String?, nationalCode: String?, createDateFrom: LocalDateTime?, createDateTo: LocalDateTime?, pageable: Pageable): Flow<ProfileModel>?


fun findByUserIdOrEmail(userId: String, email: String): Mono<ProfileModel>?
@Query("""
SELECT * FROM profile
WHERE user_id = :userId
OR ( :mobile IS NOT NULL AND mobile = :mobile )
OR ( :email IS NOT NULL AND lower(email) = lower(:email) )
""")
fun findByUserIdOrEmailOrMobile(userId: String, email: String? , mobile : String?): Mono<ProfileModel>?


}
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,10 @@ class ProfileManagementImp(
}

override suspend fun createProfile(data: Profile): Mono<Profile> {
profileRepository.findByUserIdOrEmail(data.userId!!, data.email!!)?.awaitFirstOrNull()?.let {
if (data.email.isNullOrBlank() && data.mobile.isNullOrBlank()) {
throw OpexError.BadRequest.exception("email and mobile is null or empty")
}
profileRepository.findByUserIdOrEmailOrMobile(data.userId!!, data.email, data.mobile)?.awaitFirstOrNull()?.let {
throw OpexError.UserIdAlreadyExists.exception()
} ?: run {
val profile: ProfileModel = data.convert(ProfileModel::class.java)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,4 +292,34 @@ $$
ALTER COLUMN gender SET DATA TYPE VARCHAR(50);
END IF;
END
$$;

DO
$$
BEGIN
IF EXISTS (SELECT 1
FROM information_schema.columns
WHERE table_name = 'profile'
AND column_name = 'email') THEN ALTER TABLE profile
ALTER COLUMN email DROP NOT NULL;
END IF;
IF EXISTS (SELECT 1
FROM information_schema.columns
WHERE table_name = 'profile'
AND column_name = 'identifier') THEN ALTER TABLE profile
ADD CONSTRAINT unique_identifier UNIQUE (identifier);
END IF;
IF EXISTS (SELECT 1
FROM information_schema.columns
WHERE table_name = 'profile'
AND column_name = 'mobile') THEN ALTER TABLE profile
ADD CONSTRAINT unique_mobile UNIQUE (mobile);
END IF;
IF EXISTS (SELECT 1
FROM information_schema.columns
WHERE table_name = 'profile_history'
AND column_name = 'email') THEN ALTER TABLE profile_history
ALTER COLUMN email DROP NOT NULL;
END IF;
END
$$;
Loading