pull request for orange

.github/workflows/build.yml

@@ -0,0 +1,63 @@
+name: CI
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+    branches:
+      - develop
+env:
+  REGISTRY: ghcr.io
+  REPO_OWNER: ${{ github.repository_owner }}
+jobs:
+  build:
+    strategy:
+      matrix:
+        image_name: [ "auth-service" ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Maven Mirror Config Settings
+        uses: s4u/maven-settings-action@v3.0.0
+        with:
+          servers: ${{ secrets.MAVEN_SERVERS }}
+          mirrors: ${{ secrets.MAVEN_MIRRORS }}
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'corretto'
+
+      - name: Build
+        working-directory: ${{ matrix.image_name }}
+        run: |
+          mvn --batch-mode --update-snapshots verify
+          mv build/libs/$(ls build/libs) app.jar
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_TOKEN }}
+
+      - name: Extract image metadata
+        id: metadata
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.REPO_OWNER }}/${{ matrix.image_name }}
+          tags: latest
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: ${{ matrix.image_name }}
+          file: ${{ matrix.image_name }}/Dockerfile
+          push: true
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          secrets: |
+            GTOKEN=${{ secrets.GH_TOKEN }}

auth-service/Dockerfile

@@ -0,0 +1,6 @@
+FROM amazoncorretto:17-alpine
+RUN mkdir /app
+COPY auth-container/target/auth-container-0.0.1-SNAPSHOT.jar /app/auth-container-0.0.1-SNAPSHOT.jar
+WORKDIR /app
+EXPOSE 8080
+ENTRYPOINT ["java", "-jar", "auth-container-0.0.1-SNAPSHOT.jar"]

auth-service/auth-application/auth-presentation/src/main/java/az/rock/flyjob/auth/mapper/MultipartFileWrapperMapper.java

@@ -1,6 +1,6 @@
 package az.rock.flyjob.auth.mapper;
 
-import az.rock.lib.valueObject.ContentType;
+import az.rock.lib.valueObject.FileContentType;
 import az.rock.lib.valueObject.MultipartFileWrapper;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
@@ -14,7 +14,7 @@ public MultipartFileWrapper map(MultipartFile multipartFile) throws IOException
                 .builder()
                 .originalFileName(multipartFile.getName())
                 .absolutePath(multipartFile.getOriginalFilename())
-                .contentType(ContentType.fromValue(multipartFile.getContentType()))
+                .contentType(FileContentType.fromValue(multipartFile.getContentType()))
                 .content(multipartFile.getResource().getInputStream())
                 .size(multipartFile.getSize())
                 .build();

auth-service/auth-container/src/main/java/az/rock/flyjob/auth/AuthServiceApplication.java

@@ -8,6 +8,7 @@
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
+
 @EnableDiscoveryClient
 @SpringBootApplication(
         scanBasePackages = {

auth-service/auth-data-access/src/main/java/az/rock/flyjob/auth/dataAccess/model/batis/model/package-info.java

@@ -0,0 +1 @@
+package az.rock.flyjob.auth.dataAccess.model.batis.model;

auth-service/auth-data-access/src/main/java/az/rock/flyjob/auth/dataAccess/model/compose/BaseCompose.java

@@ -3,19 +3,11 @@
 import az.rock.lib.valueObject.ProcessStatus;
 import az.rock.lib.valueObject.RowStatus;
 import com.intellibucket.lib.fj.dataaccess.annotations.Compose;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 import java.sql.Timestamp;
 import java.util.UUID;
 
 @Compose
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
 public class BaseCompose {
     private UUID uuid;
 
@@ -28,4 +20,69 @@ public class BaseCompose {
     private Timestamp createdDate;
 
     private Timestamp lastModifiedDate;
+
+    public BaseCompose(UUID uuid,
+                       Long version,
+                       ProcessStatus processStatus,
+                       RowStatus rowStatus,
+                       Timestamp createdDate,
+                       Timestamp lastModifiedDate) {
+        this.uuid = uuid;
+        this.version = version;
+        this.processStatus = processStatus;
+        this.rowStatus = rowStatus;
+        this.createdDate = createdDate;
+        this.lastModifiedDate = lastModifiedDate;
+    }
+
+    public BaseCompose() {
+    }
+
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(UUID uuid) {
+        this.uuid = uuid;
+    }
+
+    public Long getVersion() {
+        return version;
+    }
+
+    public void setVersion(Long version) {
+        this.version = version;
+    }
+
+    public ProcessStatus getProcessStatus() {
+        return processStatus;
+    }
+
+    public void setProcessStatus(ProcessStatus processStatus) {
+        this.processStatus = processStatus;
+    }
+
+    public RowStatus getRowStatus() {
+        return rowStatus;
+    }
+
+    public void setRowStatus(RowStatus rowStatus) {
+        this.rowStatus = rowStatus;
+    }
+
+    public Timestamp getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(Timestamp createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public Timestamp getLastModifiedDate() {
+        return lastModifiedDate;
+    }
+
+    public void setLastModifiedDate(Timestamp lastModifiedDate) {
+        this.lastModifiedDate = lastModifiedDate;
+    }
 }

auth-service/auth-data-access/src/main/java/az/rock/flyjob/auth/dataAccess/model/entity/AuthorityEntity.java

@@ -40,6 +40,7 @@ public class AuthorityEntity extends BaseEntity {
     @Column(name = "permission", nullable = false, unique = true)
     private String permission;
 
+
     @Column(name = "description", nullable = false)
     private String description;
 

auth-service/auth-data-access/src/main/resources/mapper/AbstractUserComposeQueryBatisMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="az.rock.flyjob.auth.dataAccess.repository.abstracts.query.batis.AbstractUserComposeQueryBatisRepository">
 
-    <sql id="user_profile_result_sql">
-        usr.uuid as uuid,
+    <sql id="user_profile_result_sql"><![CDATA[
+        select usr.uuid as uuid,
        usr.version as version,
        usr.row_status as rowStatus,
        usr.process_status as trxProcessStatus,
@@ -17,7 +17,7 @@
        usr.timezone as timezone,
        count(fr.uuid) as followCount,
        count(nr.uuid) as networkCount
-    </sql>
+        ]]></sql>
 
 
     <resultMap id="my_profile_result_map"

auth-service/auth-domain/auth-domain-presentation/src/main/java/az/rock/auth/domain/presentation/handler/concretes/email/EmailUpdateCommandHandler.java

@@ -62,7 +62,7 @@ public EmailUpdatedEvent handleEmailDeleted(EmailID emailID) {
 
     @Override
     public EmailUpdatedEvent handleEmailSetPrimary(EmailID emailID) {
-        // FIXME: 27.06.23 
+        // FIXME: 27.06.23
         var currentUserId = this.securityContextHolder.availableUser();
         var emails = this.emailQueryRepositoryAdapter.findAllMyEmails(currentUserId);
         var changedEmail = emails.stream()

auth-service/auth-domain/auth-domain-presentation/src/main/java/az/rock/auth/domain/presentation/ports/output/repository/query/AbstractCustomEducationQueryJpaRepository.java

@@ -0,0 +1,4 @@
+package az.rock.auth.domain.presentation.ports.output.repository.query;
+
+public interface AbstractCustomEducationQueryJpaRepository {
+}