-
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
26 changed files
with
195 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<module version="4"> | ||
<component name="NewModuleRootManager"> | ||
<content url="file://$MODULE_DIR$"> | ||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> | ||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> | ||
</content> | ||
</component> | ||
</module> |
13 changes: 13 additions & 0 deletions
13
carrier-service/src/main/java/com/nas/carrier/command/CarrierCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.nas.carrier.command; | ||
|
||
|
||
import lombok.Getter; | ||
import lombok.Setter; | ||
|
||
import java.util.Set; | ||
|
||
@Getter | ||
@Setter | ||
public class CarrierCommand { | ||
private Set<JobCommand> jobCommands; | ||
} |
14 changes: 14 additions & 0 deletions
14
carrier-service/src/main/java/com/nas/carrier/dto/ApplicationSubmitDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package com.nas.carrier.dto; | ||
|
||
|
||
import lombok.Getter; | ||
import lombok.Setter; | ||
|
||
|
||
@Getter | ||
@Setter | ||
public class ApplicationSubmitDto { | ||
private String id; | ||
private String fullName; | ||
private String email; | ||
} |
14 changes: 14 additions & 0 deletions
14
carrier-service/src/main/java/com/nas/carrier/dto/CarrierDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package com.nas.carrier.dto; | ||
|
||
|
||
import lombok.Getter; | ||
import lombok.Setter; | ||
|
||
import java.util.Set; | ||
|
||
@Getter | ||
@Setter | ||
public class CarrierDto { | ||
private String id; | ||
private Set<JobDto> jobs; | ||
} |
15 changes: 15 additions & 0 deletions
15
carrier-service/src/main/java/com/nas/carrier/dto/JobDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package com.nas.carrier.dto; | ||
|
||
|
||
import lombok.Getter; | ||
import lombok.Setter; | ||
|
||
import java.util.Set; | ||
|
||
@Getter | ||
@Setter | ||
public class JobDto { | ||
private String id; | ||
private String description; | ||
private Set<ApplicationSubmitDto> applicationSubmitSet; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
carrier-service/src/main/java/com/nas/carrier/repository/ApplicationSubmitRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package com.nas.carrier.repository; | ||
|
||
import com.nas.carrier.model.ApplicationSubmit; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
import org.springframework.stereotype.Repository; | ||
|
||
|
||
@Repository | ||
public interface ApplicationSubmitRepository extends JpaRepository<ApplicationSubmit, String> { | ||
} |
10 changes: 10 additions & 0 deletions
10
carrier-service/src/main/java/com/nas/carrier/repository/CarrierRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package com.nas.carrier.repository; | ||
|
||
import com.nas.carrier.model.Carrier; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
import org.springframework.stereotype.Repository; | ||
|
||
|
||
@Repository | ||
public interface CarrierRepository extends JpaRepository<Carrier, String> { | ||
} |
10 changes: 10 additions & 0 deletions
10
carrier-service/src/main/java/com/nas/carrier/repository/JobRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package com.nas.carrier.repository; | ||
|
||
import com.nas.carrier.model.Job; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
import org.springframework.stereotype.Repository; | ||
|
||
|
||
@Repository | ||
public interface JobRepository extends JpaRepository<Job, String> { | ||
} |
4 changes: 4 additions & 0 deletions
4
carrier-service/src/main/java/com/nas/carrier/service/carrier/CarrierService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
package com.nas.carrier.service.carrier; | ||
|
||
public interface CarrierService { | ||
} |
12 changes: 12 additions & 0 deletions
12
carrier-service/src/main/java/com/nas/carrier/service/carrier/CarrierServiceImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package com.nas.carrier.service.carrier; | ||
|
||
|
||
import lombok.RequiredArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.springframework.stereotype.Service; | ||
|
||
@Service | ||
@Slf4j | ||
@RequiredArgsConstructor | ||
public class CarrierServiceImpl implements CarrierService{ | ||
} |
4 changes: 4 additions & 0 deletions
4
carrier-service/src/main/java/com/nas/carrier/service/job/JobService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
package com.nas.carrier.service.job; | ||
|
||
public interface JobService { | ||
} |
12 changes: 12 additions & 0 deletions
12
carrier-service/src/main/java/com/nas/carrier/service/job/JobServiceImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package com.nas.carrier.service.job; | ||
|
||
|
||
import lombok.RequiredArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.springframework.stereotype.Service; | ||
|
||
@Service | ||
@Slf4j | ||
@RequiredArgsConstructor | ||
public class JobServiceImpl implements JobService{ | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
spring: | ||
devtools: | ||
livereload: | ||
enabled: true | ||
jpa: | ||
properties: | ||
hibernate: | ||
dialect: org.hibernate.dialect.PostgreSQLDialect | ||
hibernate: | ||
ddl-auto: update | ||
show-sql: true | ||
datasource: | ||
driverClassName: org.postgresql.Driver | ||
url: jdbc:postgresql://localhost:5432/carrier | ||
username: postgres | ||
password: postgres | ||
|
||
application: | ||
name: driver | ||
profiles: | ||
active: default | ||
|
||
|
||
server: | ||
port: 8084 |
8 changes: 8 additions & 0 deletions
8
carrier-service/src/test/java/com.nas.carrier/CarrierServiceApplicationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package com.nas.carrier; | ||
|
||
|
||
import org.springframework.boot.test.context.SpringBootTest; | ||
|
||
@SpringBootTest | ||
public class CarrierServiceApplicationTest { | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 1 addition & 29 deletions
30
customer-service/src/main/java/com/nas/customer/service/repository/CustomerRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,43 +1,15 @@ | ||
package com.nas.customer.service.repository; | ||
|
||
import com.nas.core.util.PatternUtil; | ||
import com.nas.customer.service.criteria.CustomerCriteria; | ||
import com.nas.customer.service.model.Customer; | ||
import org.springframework.data.domain.Page; | ||
import org.springframework.data.domain.Pageable; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; | ||
import org.springframework.stereotype.Repository; | ||
|
||
import javax.persistence.criteria.Predicate; | ||
import java.time.LocalDateTime; | ||
import java.util.ArrayList; | ||
import java.util.Arrays; | ||
import java.util.List; | ||
|
||
import static com.nas.customer.service.model.BaseEntity_.ACTIVE; | ||
import static com.nas.customer.service.model.Customer_.FIRST_NAME; | ||
import static com.nas.customer.service.model.Customer_.LAST_NAME; | ||
|
||
|
||
@Repository | ||
public interface CustomerRepository extends JpaRepository<Customer, String> , JpaSpecificationExecutor<Customer> { | ||
default Page<Customer> findCustomersByDeletedFalse(Pageable pageable, CustomerCriteria customerCriteria){ | ||
return findAll((root, query, builder) -> { | ||
List<Predicate> predicates = new ArrayList<>(Arrays.asList( | ||
builder.greaterThanOrEqualTo(root.get(FIRST_NAME), LocalDateTime.now()) | ||
)); | ||
if (customerCriteria.getLastName() != null) { | ||
String pattern = PatternUtil.likePattern(customerCriteria.getLastName().toUpperCase()); | ||
predicates.add(builder.like(builder.upper(root.get(LAST_NAME)), pattern)); | ||
} | ||
if (customerCriteria.getActive() != null) { | ||
predicates.add(builder.equal(root.get(ACTIVE), customerCriteria.getActive())); | ||
} | ||
query.orderBy(builder.desc(root.get(ACTIVE))); | ||
return builder.and(predicates.toArray(new Predicate[]{})); | ||
|
||
}, pageable); | ||
} | ||
Page<Customer> findCustomersByDeletedFalse(Pageable pageable); | ||
Customer findByDriverId(String driverId); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.