package name change to canevim

pom.xml

@@ -8,7 +8,7 @@
 		<version>3.0.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>com.zorgundostu.integration</groupId>
+	<groupId>com.canevim.integration</groupId>
 	<artifactId>zgd-integration-service</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>zgd-integration-service</name>

src/main/java/com/zorgundostu/integration/ZgdIntegrationServiceApplication.java → 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;

src/main/java/com/zorgundostu/integration/client/IntegrationHttpClient.java → 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

src/main/java/com/zorgundostu/integration/client/IntegrationHttpClientConfig.java → 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;

src/main/java/com/zorgundostu/integration/client/IntegrationHttpClientConstants.java → 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(){}

src/main/java/com/zorgundostu/integration/client/IntegrationHttpUtils.java → 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;
 

src/main/java/com/zorgundostu/integration/client/RequestFilter.java → 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;

src/main/java/com/zorgundostu/integration/config/JacksonConfig.java → 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;

src/main/java/com/zorgundostu/integration/config/ShelterConfig.java → 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;

src/main/java/com/zorgundostu/integration/config/SmsConfig.java → 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;

src/main/java/com/zorgundostu/integration/config/SoapClientConfig.java → 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;

src/main/java/com/zorgundostu/integration/constant/IntegrationConstants.java → 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 {

src/main/java/com/zorgundostu/integration/domain/identity/client/IdentityClient.java → 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

src/main/java/com/zorgundostu/integration/domain/identity/client/interceptor/ZgdClientInterceptor.java → 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

src/main/java/com/zorgundostu/integration/domain/identity/model/BaseEntity.java → 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

src/main/java/com/zorgundostu/integration/domain/identity/model/Header.java → 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;

src/main/java/com/zorgundostu/integration/domain/identity/model/ResponseAndHeader.java → 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;

src/main/java/com/zorgundostu/integration/domain/identity/model/identity/Identity.java → 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;

src/main/java/com/zorgundostu/integration/domain/identity/model/identity/IdentityDto.java → 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,

src/main/java/com/zorgundostu/integration/domain/identity/model/identity/TCKimlikNoDogrula.java → 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;
 
 

src/main/java/com/zorgundostu/integration/domain/identity/repository/IdentityRepository.java → 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;

src/main/java/com/zorgundostu/integration/domain/identity/service/IdentityService.java → 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;

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);
+
+}

src/main/java/com/zorgundostu/integration/domain/notification/client/SmsClient.java → 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

src/main/java/com/zorgundostu/integration/domain/notification/model/BaseEntity.java → 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;

src/main/java/com/zorgundostu/integration/domain/notification/model/notification/Notification.java → 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;

src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationContent.java → 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"),

src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationDto.java → 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;
 

src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationParameter.java → 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;

src/main/java/com/zorgundostu/integration/domain/notification/model/notification/NotificationType.java → 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

src/main/java/com/zorgundostu/integration/domain/notification/model/notification/Sms.java → 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;
 

src/main/java/com/zorgundostu/integration/domain/notification/repository/NotificationRepository.java → 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;

src/main/java/com/zorgundostu/integration/domain/notification/service/NotificationService.java → 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("</string>")));
     }