diff --git a/pom.xml b/pom.xml index 1596276..d4cfa6d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 3.0.2 - com.zorgundostu.integration + com.canevim.integration zgd-integration-service 0.0.1-SNAPSHOT zgd-integration-service diff --git a/src/main/java/com/zorgundostu/integration/ZgdIntegrationServiceApplication.java b/src/main/java/com/canevim/integration/ZgdIntegrationServiceApplication.java similarity index 92% rename from src/main/java/com/zorgundostu/integration/ZgdIntegrationServiceApplication.java rename to src/main/java/com/canevim/integration/ZgdIntegrationServiceApplication.java index 7830e5e..59b8fe3 100644 --- a/src/main/java/com/zorgundostu/integration/ZgdIntegrationServiceApplication.java +++ b/src/main/java/com/canevim/integration/ZgdIntegrationServiceApplication.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration; +package com.canevim.integration; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; diff --git a/src/main/java/com/zorgundostu/integration/client/IntegrationHttpClient.java b/src/main/java/com/canevim/integration/client/IntegrationHttpClient.java similarity index 93% rename from src/main/java/com/zorgundostu/integration/client/IntegrationHttpClient.java rename to src/main/java/com/canevim/integration/client/IntegrationHttpClient.java index f214e9d..3569118 100644 --- a/src/main/java/com/zorgundostu/integration/client/IntegrationHttpClient.java +++ b/src/main/java/com/canevim/integration/client/IntegrationHttpClient.java @@ -1,11 +1,8 @@ -package com.zorgundostu.integration.client; - -import static com.zorgundostu.integration.client.IntegrationHttpClientConstants.AUTHORIZATION_KEY; -import static com.zorgundostu.integration.client.IntegrationHttpClientConstants.CONTENT_TYPE_KEY; -import static com.zorgundostu.integration.client.IntegrationHttpClientConstants.CORRELATION_ID; -import static com.zorgundostu.integration.client.IntegrationHttpClientConstants.SHELTER_HTTP_CLIENT; -import static com.zorgundostu.integration.client.IntegrationHttpClientConstants.TOKEN_KEY; -import static com.zorgundostu.integration.constant.IntegrationConstants.SHELTER_OBJECT_MAPPER; +package com.canevim.integration.client; + +import static com.canevim.integration.client.IntegrationHttpClientConstants.CONTENT_TYPE_KEY; +import static com.canevim.integration.client.IntegrationHttpClientConstants.SHELTER_HTTP_CLIENT; +import static com.canevim.integration.constant.IntegrationConstants.SHELTER_OBJECT_MAPPER; import static java.nio.charset.StandardCharsets.UTF_8; import java.net.URI; @@ -19,18 +16,19 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.JsonParser; -import com.zorgundostu.integration.exception.ShelterException; -import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; +import com.canevim.integration.exception.ShelterException; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.JsonParser; + +import lombok.extern.slf4j.Slf4j; + @Slf4j @Component diff --git a/src/main/java/com/zorgundostu/integration/client/IntegrationHttpClientConfig.java b/src/main/java/com/canevim/integration/client/IntegrationHttpClientConfig.java similarity index 85% rename from src/main/java/com/zorgundostu/integration/client/IntegrationHttpClientConfig.java rename to src/main/java/com/canevim/integration/client/IntegrationHttpClientConfig.java index 871e11d..66e5321 100644 --- a/src/main/java/com/zorgundostu/integration/client/IntegrationHttpClientConfig.java +++ b/src/main/java/com/canevim/integration/client/IntegrationHttpClientConfig.java @@ -1,6 +1,6 @@ -package com.zorgundostu.integration.client; +package com.canevim.integration.client; -import static com.zorgundostu.integration.client.IntegrationHttpClientConstants.SHELTER_HTTP_CLIENT; +import static com.canevim.integration.client.IntegrationHttpClientConstants.SHELTER_HTTP_CLIENT; import java.net.http.HttpClient; import java.time.Duration; diff --git a/src/main/java/com/zorgundostu/integration/client/IntegrationHttpClientConstants.java b/src/main/java/com/canevim/integration/client/IntegrationHttpClientConstants.java similarity index 94% rename from src/main/java/com/zorgundostu/integration/client/IntegrationHttpClientConstants.java rename to src/main/java/com/canevim/integration/client/IntegrationHttpClientConstants.java index b82db5d..cb5c31a 100644 --- a/src/main/java/com/zorgundostu/integration/client/IntegrationHttpClientConstants.java +++ b/src/main/java/com/canevim/integration/client/IntegrationHttpClientConstants.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.client; +package com.canevim.integration.client; public final class IntegrationHttpClientConstants { private IntegrationHttpClientConstants(){} diff --git a/src/main/java/com/zorgundostu/integration/client/IntegrationHttpUtils.java b/src/main/java/com/canevim/integration/client/IntegrationHttpUtils.java similarity index 88% rename from src/main/java/com/zorgundostu/integration/client/IntegrationHttpUtils.java rename to src/main/java/com/canevim/integration/client/IntegrationHttpUtils.java index aca83c8..fe763e3 100644 --- a/src/main/java/com/zorgundostu/integration/client/IntegrationHttpUtils.java +++ b/src/main/java/com/canevim/integration/client/IntegrationHttpUtils.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.client; +package com.canevim.integration.client; import java.util.Map; diff --git a/src/main/java/com/zorgundostu/integration/client/RequestFilter.java b/src/main/java/com/canevim/integration/client/RequestFilter.java similarity index 70% rename from src/main/java/com/zorgundostu/integration/client/RequestFilter.java rename to src/main/java/com/canevim/integration/client/RequestFilter.java index 5efd8b6..8d5280d 100644 --- a/src/main/java/com/zorgundostu/integration/client/RequestFilter.java +++ b/src/main/java/com/canevim/integration/client/RequestFilter.java @@ -1,11 +1,11 @@ -package com.zorgundostu.integration.client; +package com.canevim.integration.client; -import static com.zorgundostu.integration.client.IntegrationHttpClientConstants.AUTHORIZATION_KEY; -import static com.zorgundostu.integration.client.IntegrationHttpClientConstants.BEARER_KEY; -import static com.zorgundostu.integration.client.IntegrationHttpClientConstants.CORRELATION_ID; -import static com.zorgundostu.integration.client.IntegrationHttpClientConstants.CORRELATION_ID_DATE_FORMAT; -import static com.zorgundostu.integration.client.IntegrationHttpClientConstants.CORRELATION_ID_PREFIX; -import static com.zorgundostu.integration.client.IntegrationHttpClientConstants.TOKEN_KEY; +import static com.canevim.integration.client.IntegrationHttpClientConstants.AUTHORIZATION_KEY; +import static com.canevim.integration.client.IntegrationHttpClientConstants.BEARER_KEY; +import static com.canevim.integration.client.IntegrationHttpClientConstants.CORRELATION_ID; +import static com.canevim.integration.client.IntegrationHttpClientConstants.CORRELATION_ID_DATE_FORMAT; +import static com.canevim.integration.client.IntegrationHttpClientConstants.CORRELATION_ID_PREFIX; +import static com.canevim.integration.client.IntegrationHttpClientConstants.TOKEN_KEY; import java.io.IOException; import java.time.LocalDateTime; diff --git a/src/main/java/com/zorgundostu/integration/config/JacksonConfig.java b/src/main/java/com/canevim/integration/config/JacksonConfig.java similarity index 96% rename from src/main/java/com/zorgundostu/integration/config/JacksonConfig.java rename to src/main/java/com/canevim/integration/config/JacksonConfig.java index 066fbf4..a6b6484 100755 --- a/src/main/java/com/zorgundostu/integration/config/JacksonConfig.java +++ b/src/main/java/com/canevim/integration/config/JacksonConfig.java @@ -1,9 +1,9 @@ /** * */ -package com.zorgundostu.integration.config; +package com.canevim.integration.config; -import static com.zorgundostu.integration.constant.IntegrationConstants.SHELTER_OBJECT_MAPPER; +import static com.canevim.integration.constant.IntegrationConstants.SHELTER_OBJECT_MAPPER; import java.io.IOException; import java.time.LocalDate; diff --git a/src/main/java/com/zorgundostu/integration/config/ShelterConfig.java b/src/main/java/com/canevim/integration/config/ShelterConfig.java similarity index 90% rename from src/main/java/com/zorgundostu/integration/config/ShelterConfig.java rename to src/main/java/com/canevim/integration/config/ShelterConfig.java index 3553e5c..98c91dc 100644 --- a/src/main/java/com/zorgundostu/integration/config/ShelterConfig.java +++ b/src/main/java/com/canevim/integration/config/ShelterConfig.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.config; +package com.canevim.integration.config; import lombok.Data; import lombok.Getter; diff --git a/src/main/java/com/zorgundostu/integration/config/SmsConfig.java b/src/main/java/com/canevim/integration/config/SmsConfig.java similarity index 90% rename from src/main/java/com/zorgundostu/integration/config/SmsConfig.java rename to src/main/java/com/canevim/integration/config/SmsConfig.java index cee5c76..76203bf 100644 --- a/src/main/java/com/zorgundostu/integration/config/SmsConfig.java +++ b/src/main/java/com/canevim/integration/config/SmsConfig.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.config; +package com.canevim.integration.config; import lombok.Data; diff --git a/src/main/java/com/zorgundostu/integration/config/SoapClientConfig.java b/src/main/java/com/canevim/integration/config/SoapClientConfig.java similarity index 87% rename from src/main/java/com/zorgundostu/integration/config/SoapClientConfig.java rename to src/main/java/com/canevim/integration/config/SoapClientConfig.java index 05e5f36..9100861 100644 --- a/src/main/java/com/zorgundostu/integration/config/SoapClientConfig.java +++ b/src/main/java/com/canevim/integration/config/SoapClientConfig.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.config; +package com.canevim.integration.config; import lombok.Data; diff --git a/src/main/java/com/zorgundostu/integration/constant/IntegrationConstants.java b/src/main/java/com/canevim/integration/constant/IntegrationConstants.java similarity index 77% rename from src/main/java/com/zorgundostu/integration/constant/IntegrationConstants.java rename to src/main/java/com/canevim/integration/constant/IntegrationConstants.java index 5ea91fd..f4d7589 100644 --- a/src/main/java/com/zorgundostu/integration/constant/IntegrationConstants.java +++ b/src/main/java/com/canevim/integration/constant/IntegrationConstants.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.constant; +package com.canevim.integration.constant; public class IntegrationConstants { diff --git a/src/main/java/com/zorgundostu/integration/domain/identity/client/IdentityClient.java b/src/main/java/com/canevim/integration/domain/identity/client/IdentityClient.java similarity index 91% rename from src/main/java/com/zorgundostu/integration/domain/identity/client/IdentityClient.java rename to src/main/java/com/canevim/integration/domain/identity/client/IdentityClient.java index f399503..94ed80e 100644 --- a/src/main/java/com/zorgundostu/integration/domain/identity/client/IdentityClient.java +++ b/src/main/java/com/canevim/integration/domain/identity/client/IdentityClient.java @@ -1,20 +1,27 @@ -package com.zorgundostu.integration.domain.identity.client; +package com.canevim.integration.domain.identity.client; + +import java.io.IOException; +import java.util.Iterator; + +import javax.xml.transform.dom.DOMSource; -import com.zorgundostu.integration.config.SoapClientConfig; -import com.zorgundostu.integration.domain.identity.model.identity.TCKimlikNoDogrula; -import com.zorgundostu.integration.domain.identity.model.Header; -import com.zorgundostu.integration.domain.identity.model.identity.IdentityDto; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import okhttp3.*; import org.springframework.stereotype.Service; import org.springframework.ws.soap.SoapHeaderElement; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import javax.xml.transform.dom.DOMSource; -import java.io.IOException; -import java.util.Iterator; +import com.canevim.integration.config.SoapClientConfig; +import com.canevim.integration.domain.identity.model.Header; +import com.canevim.integration.domain.identity.model.identity.IdentityDto; +import com.canevim.integration.domain.identity.model.identity.TCKimlikNoDogrula; + +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; @Slf4j @Service diff --git a/src/main/java/com/zorgundostu/integration/domain/identity/client/interceptor/ZgdClientInterceptor.java b/src/main/java/com/canevim/integration/domain/identity/client/interceptor/ZgdClientInterceptor.java similarity index 97% rename from src/main/java/com/zorgundostu/integration/domain/identity/client/interceptor/ZgdClientInterceptor.java rename to src/main/java/com/canevim/integration/domain/identity/client/interceptor/ZgdClientInterceptor.java index a0af797..b3876bb 100644 --- a/src/main/java/com/zorgundostu/integration/domain/identity/client/interceptor/ZgdClientInterceptor.java +++ b/src/main/java/com/canevim/integration/domain/identity/client/interceptor/ZgdClientInterceptor.java @@ -1,13 +1,14 @@ -package com.zorgundostu.integration.domain.identity.client.interceptor; +package com.canevim.integration.domain.identity.client.interceptor; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.ws.client.WebServiceClientException; import org.springframework.ws.client.support.interceptor.ClientInterceptor; import org.springframework.ws.context.MessageContext; -import java.io.ByteArrayOutputStream; -import java.io.IOException; +import lombok.extern.slf4j.Slf4j; @Component @Slf4j diff --git a/src/main/java/com/zorgundostu/integration/domain/identity/model/BaseEntity.java b/src/main/java/com/canevim/integration/domain/identity/model/BaseEntity.java similarity index 93% rename from src/main/java/com/zorgundostu/integration/domain/identity/model/BaseEntity.java rename to src/main/java/com/canevim/integration/domain/identity/model/BaseEntity.java index 7c533da..1054c3b 100644 --- a/src/main/java/com/zorgundostu/integration/domain/identity/model/BaseEntity.java +++ b/src/main/java/com/canevim/integration/domain/identity/model/BaseEntity.java @@ -1,15 +1,16 @@ -package com.zorgundostu.integration.domain.identity.model; +package com.canevim.integration.domain.identity.model; + +import java.time.LocalDateTime; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; -import jakarta.persistence.MappedSuperclass; -import lombok.Data; import org.hibernate.annotations.GenericGenerator; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.annotation.Version; -import java.time.LocalDateTime; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import lombok.Data; @Data @MappedSuperclass diff --git a/src/main/java/com/zorgundostu/integration/domain/identity/model/Header.java b/src/main/java/com/canevim/integration/domain/identity/model/Header.java similarity index 78% rename from src/main/java/com/zorgundostu/integration/domain/identity/model/Header.java rename to src/main/java/com/canevim/integration/domain/identity/model/Header.java index 9ceae21..cf09e17 100644 --- a/src/main/java/com/zorgundostu/integration/domain/identity/model/Header.java +++ b/src/main/java/com/canevim/integration/domain/identity/model/Header.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.domain.identity.model; +package com.canevim.integration.domain.identity.model; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/zorgundostu/integration/domain/identity/model/ResponseAndHeader.java b/src/main/java/com/canevim/integration/domain/identity/model/ResponseAndHeader.java similarity index 73% rename from src/main/java/com/zorgundostu/integration/domain/identity/model/ResponseAndHeader.java rename to src/main/java/com/canevim/integration/domain/identity/model/ResponseAndHeader.java index ee566df..8366c4f 100644 --- a/src/main/java/com/zorgundostu/integration/domain/identity/model/ResponseAndHeader.java +++ b/src/main/java/com/canevim/integration/domain/identity/model/ResponseAndHeader.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.domain.identity.model; +package com.canevim.integration.domain.identity.model; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/zorgundostu/integration/domain/identity/model/identity/Identity.java b/src/main/java/com/canevim/integration/domain/identity/model/identity/Identity.java similarity index 79% rename from src/main/java/com/zorgundostu/integration/domain/identity/model/identity/Identity.java rename to src/main/java/com/canevim/integration/domain/identity/model/identity/Identity.java index 8ce8244..0f9cb63 100644 --- a/src/main/java/com/zorgundostu/integration/domain/identity/model/identity/Identity.java +++ b/src/main/java/com/canevim/integration/domain/identity/model/identity/Identity.java @@ -1,6 +1,6 @@ -package com.zorgundostu.integration.domain.identity.model.identity; +package com.canevim.integration.domain.identity.model.identity; -import com.zorgundostu.integration.domain.identity.model.BaseEntity; +import com.canevim.integration.domain.identity.model.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Table; diff --git a/src/main/java/com/zorgundostu/integration/domain/identity/model/identity/IdentityDto.java b/src/main/java/com/canevim/integration/domain/identity/model/identity/IdentityDto.java similarity index 70% rename from src/main/java/com/zorgundostu/integration/domain/identity/model/identity/IdentityDto.java rename to src/main/java/com/canevim/integration/domain/identity/model/identity/IdentityDto.java index 89f428d..4f76bf3 100644 --- a/src/main/java/com/zorgundostu/integration/domain/identity/model/identity/IdentityDto.java +++ b/src/main/java/com/canevim/integration/domain/identity/model/identity/IdentityDto.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.domain.identity.model.identity; +package com.canevim.integration.domain.identity.model.identity; public record IdentityDto( String identityNumber, diff --git a/src/main/java/com/zorgundostu/integration/domain/identity/model/identity/TCKimlikNoDogrula.java b/src/main/java/com/canevim/integration/domain/identity/model/identity/TCKimlikNoDogrula.java similarity index 72% rename from src/main/java/com/zorgundostu/integration/domain/identity/model/identity/TCKimlikNoDogrula.java rename to src/main/java/com/canevim/integration/domain/identity/model/identity/TCKimlikNoDogrula.java index 2242ed7..797783e 100644 --- a/src/main/java/com/zorgundostu/integration/domain/identity/model/identity/TCKimlikNoDogrula.java +++ b/src/main/java/com/canevim/integration/domain/identity/model/identity/TCKimlikNoDogrula.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.domain.identity.model.identity; +package com.canevim.integration.domain.identity.model.identity; import lombok.Data; diff --git a/src/main/java/com/zorgundostu/integration/domain/identity/repository/IdentityRepository.java b/src/main/java/com/canevim/integration/domain/identity/repository/IdentityRepository.java similarity index 71% rename from src/main/java/com/zorgundostu/integration/domain/identity/repository/IdentityRepository.java rename to src/main/java/com/canevim/integration/domain/identity/repository/IdentityRepository.java index 9410755..6d830e7 100644 --- a/src/main/java/com/zorgundostu/integration/domain/identity/repository/IdentityRepository.java +++ b/src/main/java/com/canevim/integration/domain/identity/repository/IdentityRepository.java @@ -1,7 +1,7 @@ -package com.zorgundostu.integration.domain.identity.repository; +package com.canevim.integration.domain.identity.repository; -import com.zorgundostu.integration.domain.identity.model.identity.Identity; +import com.canevim.integration.domain.identity.model.identity.Identity; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/zorgundostu/integration/domain/identity/service/IdentityService.java b/src/main/java/com/canevim/integration/domain/identity/service/IdentityService.java similarity index 75% rename from src/main/java/com/zorgundostu/integration/domain/identity/service/IdentityService.java rename to src/main/java/com/canevim/integration/domain/identity/service/IdentityService.java index 6b9aa9d..b4762b9 100644 --- a/src/main/java/com/zorgundostu/integration/domain/identity/service/IdentityService.java +++ b/src/main/java/com/canevim/integration/domain/identity/service/IdentityService.java @@ -1,9 +1,9 @@ -package com.zorgundostu.integration.domain.identity.service; +package com.canevim.integration.domain.identity.service; -import com.zorgundostu.integration.domain.identity.client.IdentityClient; -import com.zorgundostu.integration.domain.identity.model.identity.IdentityDto; -import com.zorgundostu.integration.domain.identity.repository.IdentityRepository; -import com.zorgundostu.integration.domain.identity.util.mapper.IdentityMapper; +import com.canevim.integration.domain.identity.client.IdentityClient; +import com.canevim.integration.domain.identity.model.identity.IdentityDto; +import com.canevim.integration.domain.identity.repository.IdentityRepository; +import com.canevim.integration.domain.identity.util.mapper.IdentityMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; diff --git a/src/main/java/com/canevim/integration/domain/identity/util/mapper/IdentityMapper.java b/src/main/java/com/canevim/integration/domain/identity/util/mapper/IdentityMapper.java new file mode 100644 index 0000000..ff890e5 --- /dev/null +++ b/src/main/java/com/canevim/integration/domain/identity/util/mapper/IdentityMapper.java @@ -0,0 +1,14 @@ +package com.canevim.integration.domain.identity.util.mapper; + +import com.canevim.integration.domain.identity.model.identity.Identity; +import com.canevim.integration.domain.identity.model.identity.IdentityDto; +import org.mapstruct.Mapper; + + +@Mapper(componentModel = "spring") +public interface IdentityMapper { + Identity toDao(IdentityDto dto); + + IdentityDto toDto(Identity identity); + +} diff --git a/src/main/java/com/zorgundostu/integration/domain/notification/client/SmsClient.java b/src/main/java/com/canevim/integration/domain/notification/client/SmsClient.java similarity index 94% rename from src/main/java/com/zorgundostu/integration/domain/notification/client/SmsClient.java rename to src/main/java/com/canevim/integration/domain/notification/client/SmsClient.java index 6975c6e..f5a1ce0 100644 --- a/src/main/java/com/zorgundostu/integration/domain/notification/client/SmsClient.java +++ b/src/main/java/com/canevim/integration/domain/notification/client/SmsClient.java @@ -1,6 +1,5 @@ -package com.zorgundostu.integration.domain.notification.client; +package com.canevim.integration.domain.notification.client; -import com.zorgundostu.integration.config.SmsConfig; import jakarta.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.web.client.RestTemplateBuilder; @@ -10,6 +9,8 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import com.canevim.integration.config.SmsConfig; + import java.util.List; @Slf4j diff --git a/src/main/java/com/zorgundostu/integration/domain/notification/model/BaseEntity.java b/src/main/java/com/canevim/integration/domain/notification/model/BaseEntity.java similarity index 91% rename from src/main/java/com/zorgundostu/integration/domain/notification/model/BaseEntity.java rename to src/main/java/com/canevim/integration/domain/notification/model/BaseEntity.java index 3c2e749..9d245c5 100644 --- a/src/main/java/com/zorgundostu/integration/domain/notification/model/BaseEntity.java +++ b/src/main/java/com/canevim/integration/domain/notification/model/BaseEntity.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.domain.notification.model; +package com.canevim.integration.domain.notification.model; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; diff --git a/src/main/java/com/zorgundostu/integration/domain/notification/model/notification/Notification.java b/src/main/java/com/canevim/integration/domain/notification/model/notification/Notification.java similarity index 81% rename from src/main/java/com/zorgundostu/integration/domain/notification/model/notification/Notification.java rename to src/main/java/com/canevim/integration/domain/notification/model/notification/Notification.java index 8bf7b8b..9fec3e5 100644 --- a/src/main/java/com/zorgundostu/integration/domain/notification/model/notification/Notification.java +++ b/src/main/java/com/canevim/integration/domain/notification/model/notification/Notification.java @@ -1,7 +1,7 @@ -package com.zorgundostu.integration.domain.notification.model.notification; +package com.canevim.integration.domain.notification.model.notification; import com.vladmihalcea.hibernate.type.json.JsonType; -import com.zorgundostu.integration.domain.notification.model.BaseEntity; +import com.canevim.integration.domain.notification.model.BaseEntity; import jakarta.persistence.*; import lombok.Data; import org.hibernate.annotations.Type; diff --git a/src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationContent.java b/src/main/java/com/canevim/integration/domain/notification/model/notification/NotificationContent.java similarity index 84% rename from src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationContent.java rename to src/main/java/com/canevim/integration/domain/notification/model/notification/NotificationContent.java index 0e486f5..8a1279a 100644 --- a/src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationContent.java +++ b/src/main/java/com/canevim/integration/domain/notification/model/notification/NotificationContent.java @@ -1,7 +1,7 @@ -package com.zorgundostu.integration.domain.notification.model.notification; +package com.canevim.integration.domain.notification.model.notification; public enum NotificationContent { - WELCOME("Zorgundostu'ya hoşgeldiniz", "Welcome to Zorgundostu"), + WELCOME("CANEVIM'e hoşgeldiniz", "Welcome to CANEVIM"), CONFIRMATION("Hesabınızı onaylayın", "Confirm your account"), PASSWORD_RESET("Şifrenizi sıfırlayın", "Reset your password"), PASSWORD_CHANGED("Şifreniz değiştirildi", "Your password has been changed"), diff --git a/src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationDto.java b/src/main/java/com/canevim/integration/domain/notification/model/notification/NotificationDto.java similarity index 94% rename from src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationDto.java rename to src/main/java/com/canevim/integration/domain/notification/model/notification/NotificationDto.java index 83a7bfc..d49ee4e 100644 --- a/src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationDto.java +++ b/src/main/java/com/canevim/integration/domain/notification/model/notification/NotificationDto.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.domain.notification.model.notification; +package com.canevim.integration.domain.notification.model.notification; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationParameter.java b/src/main/java/com/canevim/integration/domain/notification/model/notification/NotificationParameter.java similarity index 66% rename from src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationParameter.java rename to src/main/java/com/canevim/integration/domain/notification/model/notification/NotificationParameter.java index 4835476..f2a3710 100644 --- a/src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationParameter.java +++ b/src/main/java/com/canevim/integration/domain/notification/model/notification/NotificationParameter.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.domain.notification.model.notification; +package com.canevim.integration.domain.notification.model.notification; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationType.java b/src/main/java/com/canevim/integration/domain/notification/model/notification/NotificationType.java similarity index 52% rename from src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationType.java rename to src/main/java/com/canevim/integration/domain/notification/model/notification/NotificationType.java index 2c74d17..d96731c 100644 --- a/src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationType.java +++ b/src/main/java/com/canevim/integration/domain/notification/model/notification/NotificationType.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.domain.notification.model.notification; +package com.canevim.integration.domain.notification.model.notification; public enum NotificationType { //sms or email //not null diff --git a/src/main/java/com/zorgundostu/integration/domain/notification/model/notification/Sms.java b/src/main/java/com/canevim/integration/domain/notification/model/notification/Sms.java similarity index 81% rename from src/main/java/com/zorgundostu/integration/domain/notification/model/notification/Sms.java rename to src/main/java/com/canevim/integration/domain/notification/model/notification/Sms.java index 92009aa..e83f445 100644 --- a/src/main/java/com/zorgundostu/integration/domain/notification/model/notification/Sms.java +++ b/src/main/java/com/canevim/integration/domain/notification/model/notification/Sms.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.domain.notification.model.notification; +package com.canevim.integration.domain.notification.model.notification; import lombok.Data; diff --git a/src/main/java/com/zorgundostu/integration/domain/notification/repository/NotificationRepository.java b/src/main/java/com/canevim/integration/domain/notification/repository/NotificationRepository.java similarity index 69% rename from src/main/java/com/zorgundostu/integration/domain/notification/repository/NotificationRepository.java rename to src/main/java/com/canevim/integration/domain/notification/repository/NotificationRepository.java index 9d9ad3f..f93d5f0 100644 --- a/src/main/java/com/zorgundostu/integration/domain/notification/repository/NotificationRepository.java +++ b/src/main/java/com/canevim/integration/domain/notification/repository/NotificationRepository.java @@ -1,7 +1,7 @@ -package com.zorgundostu.integration.domain.notification.repository; +package com.canevim.integration.domain.notification.repository; -import com.zorgundostu.integration.domain.notification.model.notification.Notification; +import com.canevim.integration.domain.notification.model.notification.Notification; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/zorgundostu/integration/domain/notification/service/NotificationService.java b/src/main/java/com/canevim/integration/domain/notification/service/NotificationService.java similarity index 79% rename from src/main/java/com/zorgundostu/integration/domain/notification/service/NotificationService.java rename to src/main/java/com/canevim/integration/domain/notification/service/NotificationService.java index 770f8e6..de21def 100644 --- a/src/main/java/com/zorgundostu/integration/domain/notification/service/NotificationService.java +++ b/src/main/java/com/canevim/integration/domain/notification/service/NotificationService.java @@ -1,11 +1,11 @@ -package com.zorgundostu.integration.domain.notification.service; +package com.canevim.integration.domain.notification.service; -import com.zorgundostu.integration.domain.notification.client.SmsClient; -import com.zorgundostu.integration.domain.notification.model.notification.NotificationContent; -import com.zorgundostu.integration.domain.notification.model.notification.NotificationDto; -import com.zorgundostu.integration.domain.notification.model.notification.NotificationType; -import com.zorgundostu.integration.domain.notification.repository.NotificationRepository; -import com.zorgundostu.integration.domain.notification.util.mapper.NotificationMapper; +import com.canevim.integration.domain.notification.client.SmsClient; +import com.canevim.integration.domain.notification.model.notification.NotificationContent; +import com.canevim.integration.domain.notification.model.notification.NotificationDto; +import com.canevim.integration.domain.notification.model.notification.NotificationType; +import com.canevim.integration.domain.notification.repository.NotificationRepository; +import com.canevim.integration.domain.notification.util.mapper.NotificationMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -51,7 +51,9 @@ private void sendSms(NotificationDto notificationDto) { if (content.equals(NotificationContent.OTHER)) { message = notificationDto.getParameterValueByKey("content"); } else message = content.getTr(); + String response = smsClient.sendSms(notificationDto.gsmList(), message); + log.info("SMS is sent to {}", response); notificationDto.addParameter("responseId", response.substring(response.indexOf("ID:") + 3, response.indexOf(""))); } diff --git a/src/main/java/com/canevim/integration/domain/notification/util/mapper/NotificationMapper.java b/src/main/java/com/canevim/integration/domain/notification/util/mapper/NotificationMapper.java new file mode 100644 index 0000000..5cd1260 --- /dev/null +++ b/src/main/java/com/canevim/integration/domain/notification/util/mapper/NotificationMapper.java @@ -0,0 +1,13 @@ +package com.canevim.integration.domain.notification.util.mapper; + +import com.canevim.integration.domain.notification.model.notification.Notification; +import com.canevim.integration.domain.notification.model.notification.NotificationDto; +import org.mapstruct.Mapper; + + +@Mapper(componentModel = "spring") +public interface NotificationMapper { + Notification toDao(NotificationDto notificationDto); + + NotificationDto toDto(Notification requester); +} diff --git a/src/main/java/com/zorgundostu/integration/domain/shelter/model/Shelter.java b/src/main/java/com/canevim/integration/domain/shelter/model/Shelter.java similarity index 79% rename from src/main/java/com/zorgundostu/integration/domain/shelter/model/Shelter.java rename to src/main/java/com/canevim/integration/domain/shelter/model/Shelter.java index 2e1d9c1..8093e73 100644 --- a/src/main/java/com/zorgundostu/integration/domain/shelter/model/Shelter.java +++ b/src/main/java/com/canevim/integration/domain/shelter/model/Shelter.java @@ -1,6 +1,6 @@ -package com.zorgundostu.integration.domain.shelter.model; +package com.canevim.integration.domain.shelter.model; -import com.zorgundostu.integration.domain.identity.model.BaseEntity; +import com.canevim.integration.domain.identity.model.BaseEntity; public class Shelter extends BaseEntity { private String id; diff --git a/src/main/java/com/zorgundostu/integration/domain/shelter/model/ShelterDto.java b/src/main/java/com/canevim/integration/domain/shelter/model/ShelterDto.java similarity index 87% rename from src/main/java/com/zorgundostu/integration/domain/shelter/model/ShelterDto.java rename to src/main/java/com/canevim/integration/domain/shelter/model/ShelterDto.java index 557b62d..5f1d0f0 100644 --- a/src/main/java/com/zorgundostu/integration/domain/shelter/model/ShelterDto.java +++ b/src/main/java/com/canevim/integration/domain/shelter/model/ShelterDto.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.domain.shelter.model; +package com.canevim.integration.domain.shelter.model; public record ShelterDto( String id, diff --git a/src/main/java/com/zorgundostu/integration/domain/shelter/model/ShelterMinistryResponse.java b/src/main/java/com/canevim/integration/domain/shelter/model/ShelterMinistryResponse.java similarity index 64% rename from src/main/java/com/zorgundostu/integration/domain/shelter/model/ShelterMinistryResponse.java rename to src/main/java/com/canevim/integration/domain/shelter/model/ShelterMinistryResponse.java index 6cc943c..51b6caf 100644 --- a/src/main/java/com/zorgundostu/integration/domain/shelter/model/ShelterMinistryResponse.java +++ b/src/main/java/com/canevim/integration/domain/shelter/model/ShelterMinistryResponse.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.domain.shelter.model; +package com.canevim.integration.domain.shelter.model; public record ShelterMinistryResponse( String IslemBasarilimi, diff --git a/src/main/java/com/zorgundostu/integration/domain/shelter/service/ShelterService.java b/src/main/java/com/canevim/integration/domain/shelter/service/ShelterService.java similarity index 70% rename from src/main/java/com/zorgundostu/integration/domain/shelter/service/ShelterService.java rename to src/main/java/com/canevim/integration/domain/shelter/service/ShelterService.java index 986633b..139a607 100644 --- a/src/main/java/com/zorgundostu/integration/domain/shelter/service/ShelterService.java +++ b/src/main/java/com/canevim/integration/domain/shelter/service/ShelterService.java @@ -1,13 +1,13 @@ -package com.zorgundostu.integration.domain.shelter.service; +package com.canevim.integration.domain.shelter.service; import java.util.HashMap; import java.util.Map; -import com.zorgundostu.integration.client.IntegrationHttpClient; -import com.zorgundostu.integration.client.IntegrationHttpUtils; -import com.zorgundostu.integration.config.ShelterConfig; -import com.zorgundostu.integration.domain.shelter.model.ShelterDto; -import com.zorgundostu.integration.domain.shelter.model.ShelterMinistryResponse; +import com.canevim.integration.client.IntegrationHttpClient; +import com.canevim.integration.client.IntegrationHttpUtils; +import com.canevim.integration.config.ShelterConfig; +import com.canevim.integration.domain.shelter.model.ShelterDto; +import com.canevim.integration.domain.shelter.model.ShelterMinistryResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zorgundostu/integration/exception/ErrorMessages.java b/src/main/java/com/canevim/integration/exception/ErrorMessages.java similarity index 73% rename from src/main/java/com/zorgundostu/integration/exception/ErrorMessages.java rename to src/main/java/com/canevim/integration/exception/ErrorMessages.java index 6f41dd8..3280afd 100644 --- a/src/main/java/com/zorgundostu/integration/exception/ErrorMessages.java +++ b/src/main/java/com/canevim/integration/exception/ErrorMessages.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.exception; +package com.canevim.integration.exception; public class ErrorMessages { public static final String ITEM_NOT_FOUND = "Item Not Found!"; diff --git a/src/main/java/com/zorgundostu/integration/exception/ShelterError.java b/src/main/java/com/canevim/integration/exception/ShelterError.java similarity index 88% rename from src/main/java/com/zorgundostu/integration/exception/ShelterError.java rename to src/main/java/com/canevim/integration/exception/ShelterError.java index 2bd9184..802d047 100644 --- a/src/main/java/com/zorgundostu/integration/exception/ShelterError.java +++ b/src/main/java/com/canevim/integration/exception/ShelterError.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.exception; +package com.canevim.integration.exception; import java.time.LocalDateTime; diff --git a/src/main/java/com/zorgundostu/integration/exception/ShelterException.java b/src/main/java/com/canevim/integration/exception/ShelterException.java similarity index 96% rename from src/main/java/com/zorgundostu/integration/exception/ShelterException.java rename to src/main/java/com/canevim/integration/exception/ShelterException.java index 9ff6252..84a00ef 100644 --- a/src/main/java/com/zorgundostu/integration/exception/ShelterException.java +++ b/src/main/java/com/canevim/integration/exception/ShelterException.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.exception; +package com.canevim.integration.exception; import java.io.Serializable; diff --git a/src/main/java/com/zorgundostu/integration/exception/ShelterExceptionHandler.java b/src/main/java/com/canevim/integration/exception/ShelterExceptionHandler.java similarity index 98% rename from src/main/java/com/zorgundostu/integration/exception/ShelterExceptionHandler.java rename to src/main/java/com/canevim/integration/exception/ShelterExceptionHandler.java index 85adce8..78b0835 100644 --- a/src/main/java/com/zorgundostu/integration/exception/ShelterExceptionHandler.java +++ b/src/main/java/com/canevim/integration/exception/ShelterExceptionHandler.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.exception; +package com.canevim.integration.exception; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/com/zorgundostu/integration/web/ExceptionHandlerAdvice.java b/src/main/java/com/canevim/integration/web/ExceptionHandlerAdvice.java similarity index 95% rename from src/main/java/com/zorgundostu/integration/web/ExceptionHandlerAdvice.java rename to src/main/java/com/canevim/integration/web/ExceptionHandlerAdvice.java index 65560e1..f718f02 100644 --- a/src/main/java/com/zorgundostu/integration/web/ExceptionHandlerAdvice.java +++ b/src/main/java/com/canevim/integration/web/ExceptionHandlerAdvice.java @@ -1,4 +1,4 @@ -package com.zorgundostu.integration.web; +package com.canevim.integration.web; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/zorgundostu/integration/web/identity/IdentityApi.java b/src/main/java/com/canevim/integration/web/identity/IdentityApi.java similarity index 96% rename from src/main/java/com/zorgundostu/integration/web/identity/IdentityApi.java rename to src/main/java/com/canevim/integration/web/identity/IdentityApi.java index a85331e..4bf0c8b 100644 --- a/src/main/java/com/zorgundostu/integration/web/identity/IdentityApi.java +++ b/src/main/java/com/canevim/integration/web/identity/IdentityApi.java @@ -1,6 +1,6 @@ -package com.zorgundostu.integration.web.identity; +package com.canevim.integration.web.identity; -import com.zorgundostu.integration.domain.identity.model.identity.IdentityDto; +import com.canevim.integration.domain.identity.model.identity.IdentityDto; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/zorgundostu/integration/web/identity/IdentityController.java b/src/main/java/com/canevim/integration/web/identity/IdentityController.java similarity index 79% rename from src/main/java/com/zorgundostu/integration/web/identity/IdentityController.java rename to src/main/java/com/canevim/integration/web/identity/IdentityController.java index 6bcbdde..ec0791f 100644 --- a/src/main/java/com/zorgundostu/integration/web/identity/IdentityController.java +++ b/src/main/java/com/canevim/integration/web/identity/IdentityController.java @@ -1,7 +1,7 @@ -package com.zorgundostu.integration.web.identity; +package com.canevim.integration.web.identity; -import com.zorgundostu.integration.domain.identity.model.identity.IdentityDto; -import com.zorgundostu.integration.domain.identity.service.IdentityService; +import com.canevim.integration.domain.identity.model.identity.IdentityDto; +import com.canevim.integration.domain.identity.service.IdentityService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/zorgundostu/integration/web/notification/NotificationApi.java b/src/main/java/com/canevim/integration/web/notification/NotificationApi.java similarity index 96% rename from src/main/java/com/zorgundostu/integration/web/notification/NotificationApi.java rename to src/main/java/com/canevim/integration/web/notification/NotificationApi.java index b0acee8..04ee680 100644 --- a/src/main/java/com/zorgundostu/integration/web/notification/NotificationApi.java +++ b/src/main/java/com/canevim/integration/web/notification/NotificationApi.java @@ -1,6 +1,6 @@ -package com.zorgundostu.integration.web.notification; +package com.canevim.integration.web.notification; -import com.zorgundostu.integration.domain.notification.model.notification.NotificationDto; +import com.canevim.integration.domain.notification.model.notification.NotificationDto; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/zorgundostu/integration/web/notification/NotificationController.java b/src/main/java/com/canevim/integration/web/notification/NotificationController.java similarity index 78% rename from src/main/java/com/zorgundostu/integration/web/notification/NotificationController.java rename to src/main/java/com/canevim/integration/web/notification/NotificationController.java index ab8ea29..5de2837 100644 --- a/src/main/java/com/zorgundostu/integration/web/notification/NotificationController.java +++ b/src/main/java/com/canevim/integration/web/notification/NotificationController.java @@ -1,7 +1,7 @@ -package com.zorgundostu.integration.web.notification; +package com.canevim.integration.web.notification; -import com.zorgundostu.integration.domain.notification.model.notification.NotificationDto; -import com.zorgundostu.integration.domain.notification.service.NotificationService; +import com.canevim.integration.domain.notification.model.notification.NotificationDto; +import com.canevim.integration.domain.notification.service.NotificationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/zorgundostu/integration/web/shelter/ShelterApi.java b/src/main/java/com/canevim/integration/web/shelter/ShelterApi.java similarity index 90% rename from src/main/java/com/zorgundostu/integration/web/shelter/ShelterApi.java rename to src/main/java/com/canevim/integration/web/shelter/ShelterApi.java index 20b1c76..98a7868 100644 --- a/src/main/java/com/zorgundostu/integration/web/shelter/ShelterApi.java +++ b/src/main/java/com/canevim/integration/web/shelter/ShelterApi.java @@ -1,10 +1,10 @@ -package com.zorgundostu.integration.web.shelter; +package com.canevim.integration.web.shelter; import java.util.Map; -import com.zorgundostu.integration.domain.identity.model.identity.IdentityDto; -import com.zorgundostu.integration.domain.shelter.model.ShelterDto; -import com.zorgundostu.integration.domain.shelter.model.ShelterMinistryResponse; +import com.canevim.integration.domain.identity.model.identity.IdentityDto; +import com.canevim.integration.domain.shelter.model.ShelterDto; +import com.canevim.integration.domain.shelter.model.ShelterMinistryResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/zorgundostu/integration/web/shelter/ShelterController.java b/src/main/java/com/canevim/integration/web/shelter/ShelterController.java similarity index 78% rename from src/main/java/com/zorgundostu/integration/web/shelter/ShelterController.java rename to src/main/java/com/canevim/integration/web/shelter/ShelterController.java index df27cd9..8856c20 100644 --- a/src/main/java/com/zorgundostu/integration/web/shelter/ShelterController.java +++ b/src/main/java/com/canevim/integration/web/shelter/ShelterController.java @@ -1,10 +1,10 @@ -package com.zorgundostu.integration.web.shelter; +package com.canevim.integration.web.shelter; import java.util.Map; -import com.zorgundostu.integration.domain.shelter.model.ShelterDto; -import com.zorgundostu.integration.domain.shelter.service.ShelterService; +import com.canevim.integration.domain.shelter.model.ShelterDto; +import com.canevim.integration.domain.shelter.service.ShelterService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/zorgundostu/integration/domain/identity/util/mapper/IdentityMapper.java b/src/main/java/com/zorgundostu/integration/domain/identity/util/mapper/IdentityMapper.java deleted file mode 100644 index 39aaf0e..0000000 --- a/src/main/java/com/zorgundostu/integration/domain/identity/util/mapper/IdentityMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.zorgundostu.integration.domain.identity.util.mapper; - -import com.zorgundostu.integration.domain.identity.model.identity.Identity; -import com.zorgundostu.integration.domain.identity.model.identity.IdentityDto; -import org.mapstruct.Mapper; - - -@Mapper(componentModel = "spring") -public interface IdentityMapper { - Identity toDao(IdentityDto dto); - - IdentityDto toDto(Identity identity); - -} diff --git a/src/main/java/com/zorgundostu/integration/domain/notification/util/mapper/NotificationMapper.java b/src/main/java/com/zorgundostu/integration/domain/notification/util/mapper/NotificationMapper.java deleted file mode 100644 index d270a60..0000000 --- a/src/main/java/com/zorgundostu/integration/domain/notification/util/mapper/NotificationMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.zorgundostu.integration.domain.notification.util.mapper; - -import com.zorgundostu.integration.domain.notification.model.notification.Notification; -import com.zorgundostu.integration.domain.notification.model.notification.NotificationDto; -import org.mapstruct.Mapper; - - -@Mapper(componentModel = "spring") -public interface NotificationMapper { - Notification toDao(NotificationDto notificationDto); - - NotificationDto toDto(Notification requester); -} diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index ca938bd..68f1774 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -5,9 +5,9 @@ server: spring: datasource: - url: jdbc:postgresql://localhost:5432/zorgundostu - username: test - password: test + url: jdbc:postgresql://localhost:5432/canevim + username: postgres + password: postgres driver-class-name: org.postgresql.Driver jpa: hibernate: @@ -20,7 +20,7 @@ zgd: username: asisttekno password: 100223 vendor: 10000 - header: ZORGUNDOSTU + header: CANEViM charset: turkish identity: url: https://tckimlik.nvi.gov.tr/Service/KPSPublic.asmx diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2a8faa6..c98c079 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,8 +4,10 @@ server: context-path: /api/zgd-integration/v1 spring: + profiles: + active: local datasource: - url: jdbc:postgresql://zorgundostu-db:5432/zorgundostu + url: jdbc:postgresql://zorgundostu-db:5432/canevim username: postgres password: postgres driver-class-name: org.postgresql.Driver @@ -14,13 +16,14 @@ spring: ddl-auto: update database-platform: org.hibernate.dialect.PostgreSQLDialect + zgd: sms: url: http://g.ajanswebsms.com/sms_soap/sms.asmx/send_sms username: asisttekno password: 100223 vendor: 10000 - header: ZORGUNDOSTU + header: CANEViM charset: turkish identity: url: https://tckimlik.nvi.gov.tr/Service/KPSPublic.asmx @@ -30,3 +33,4 @@ zgd: password: "b47dfdd2d981d0575655b28360c85539" apikey: "77E54B8B-F916-4D5D-A3E8-8959E08DFB5C" +