Hackster refactoring

flylight · flylight · commit ab0cfa2a81da · 2017-07-05T00:15:46.000+03:00
diff --git a/config-server/pom.xml b/config-server/pom.xml
@@ -30,6 +30,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-server</artifactId>
@@ -40,6 +41,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-eureka</artifactId>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>
diff --git a/config-server/src/main/java/com/lohika/jclub/ConfigServerApplication.java b/config-server/src/main/java/com/lohika/jclub/ConfigServerApplication.java
@@ -2,13 +2,14 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.config.server.EnableConfigServer;
 
+@EnableDiscoveryClient
 @SpringBootApplication
 @EnableConfigServer
-public class ConfigserverApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(ConfigserverApplication.class, args);
-	}
+public class ConfigServerApplication {
+  public static void main(String[] args) {
+    SpringApplication.run(ConfigServerApplication.class, args);
+  }
 }
diff --git a/config-server/src/main/resources/application.properties b/config-server/src/main/resources/application.properties
@@ -1,3 +1,7 @@
 spring.cloud.config.server.git.uri=${JAVA_CLUB_SRC_HOME}/spring-cloud
 spring.cloud.config.server.git.search-paths=config
-server.port=8888
+
+spring.cloud.config.discovery.enabled=true
+spring.application.name=config-server
+
+server.port=8888
diff --git a/config-server/src/test/java/com/lohika/jclub/ConfigServerApplicationTests.java b/config-server/src/test/java/com/lohika/jclub/ConfigServerApplicationTests.java
@@ -7,7 +7,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class ConfigserverApplicationTests {
+public class ConfigServerApplicationTests {
 
 	@Test
 	public void contextLoads() {
diff --git a/config/hackster-service.properties b/config/hackster-service.properties
@@ -0,0 +1 @@
+maxAllowedApartmentsPerRealtor=5
diff --git a/config/rating-service.properties b/config/rating-service.properties
@@ -1 +1,2 @@
 rate=10
+maxAllowedApartmentsPerRealtor=5
diff --git a/discovery-server/src/main/resources/application.properties b/discovery-server/src/main/resources/application.properties
@@ -2,4 +2,4 @@ spring.application.name=eureka-server
 server.port=8761
 
 eureka.client.register-with-eureka=false
-eureka.client.fetch-registry=false
+eureka.client.fetch-registry=false
diff --git a/hackster-service/pom.xml b/hackster-service/pom.xml
@@ -39,11 +39,17 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-eureka</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
diff --git a/hackster-service/src/main/java/com/lohika/jclub/Hackster.java b/hackster-service/src/main/java/com/lohika/jclub/Hackster.java
@@ -1,25 +1,26 @@
 package com.lohika.jclub;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-/**
- * @author Andriy Levchenko
- */
 @Data
 @NoArgsConstructor
 @RequiredArgsConstructor
 @Entity
 public class Hackster {
-  @Id @GeneratedValue
+  @Id
+  @GeneratedValue
   private long id;
 
   @NonNull
   private String phone;
+
+  @NonNull
+  private int numberOfApartments;
 }
diff --git a/hackster-service/src/main/java/com/lohika/jclub/HacksterController.java b/hackster-service/src/main/java/com/lohika/jclub/HacksterController.java
@@ -6,18 +6,21 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * @author Andriy Levchenko
- */
 @RestController
 @RequestMapping(path = "/hackster")
 public class HacksterController {
 
   @Autowired
-  private HacksterRepository hacksterRepository;
+  private HacksterService hacksterService;
 
+  /**
+   * Check if current number correspond to hackster Rrealtor.
+   *
+   * @param phone Realtor phone number.
+   * @return Is current number correspond to hackster realtor.
+   */
   @GetMapping(path = "/{phone}")
   public boolean isHackster(@PathVariable(name = "phone") String phone) {
-    return hacksterRepository.findByPhone(phone).isPresent();
+    return hacksterService.isHackster(phone);
   }
 }
diff --git a/hackster-service/src/main/java/com/lohika/jclub/HacksterRepository.java b/hackster-service/src/main/java/com/lohika/jclub/HacksterRepository.java
@@ -4,9 +4,6 @@
 
 import java.util.Optional;
 
-/**
- * @author Andriy Levchenko
- */
 public interface HacksterRepository extends JpaRepository<Hackster, Long> {
   Optional<Hackster> findByPhone(String phone);
 }
diff --git a/hackster-service/src/main/java/com/lohika/jclub/HacksterService.java b/hackster-service/src/main/java/com/lohika/jclub/HacksterService.java
@@ -0,0 +1,39 @@
+package com.lohika.jclub;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+@Service
+public class HacksterService {
+
+  @Value("${maxAllowedApartmentsPerRealtor}")
+  private int maxAllowedApartmentsPerRealtor;
+
+  @Autowired
+  private HacksterRepository hacksterRepository;
+
+  /**
+   * Check if current number exists in database and is the number of apartments related to this number
+   * satisfy our limit. If number exists and didn't satisfy condition then this number will correspond
+   * to hackster realtor otherwise no. If phone number doesn't exist then it will be added with apartment
+   * amount = 1;
+   *
+   * @param phone Phone number of Realtor.
+   * @return Is this phone number correspond to Hackster Realtor or no.
+   */
+  public boolean isHackster(String phone) {
+    Hackster hackster = hacksterRepository.findByPhone(phone)
+        .map(this::incrementApartmentCounterAndGet)
+        .orElse(new Hackster(phone, 1));
+
+    hacksterRepository.save(hackster);
+
+    return hackster.getNumberOfApartments() > maxAllowedApartmentsPerRealtor;
+  }
+
+  private Hackster incrementApartmentCounterAndGet(Hackster hackster) {
+    hackster.setNumberOfApartments(hackster.getNumberOfApartments() + 1);
+    return hackster;
+  }
+}
diff --git a/hackster-service/src/main/java/com/lohika/jclub/HacksterServiceApplication.java b/hackster-service/src/main/java/com/lohika/jclub/HacksterServiceApplication.java
@@ -1,38 +1,13 @@
 package com.lohika.jclub;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @EnableDiscoveryClient
 @SpringBootApplication
 public class HacksterServiceApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(HacksterServiceApplication.class, args);
-	}
-
-	// dummy data
-	@Component
-	class DummyCLR implements CommandLineRunner {
-
-		@Autowired
-		private HacksterRepository hacksterRepository;
-
-		@Override
-		public void run(String... strings) throws Exception {
-			List<Hackster> hacksters = Stream.of("123", "456", "789").map(Hackster::new).collect(Collectors.toList());
-			hacksterRepository.save(hacksters);
-
-
-			hacksterRepository.findAll().forEach(System.out::println);
-		}
-	}
+  public static void main(String[] args) {
+    SpringApplication.run(HacksterServiceApplication.class, args);
+  }
 }
diff --git a/rating-service/src/main/java/com/lohika/jclub/rating/service/RatingService.java b/rating-service/src/main/java/com/lohika/jclub/rating/service/RatingService.java
@@ -7,12 +7,19 @@
 import java.math.MathContext;
 import java.math.RoundingMode;
 
+import javax.annotation.PostConstruct;
+
 @Service
 public class RatingService {
 
   @Value("${rate}")
   private int rate;
 
+  @PostConstruct
+  public void test () {
+    System.out.println(rate);
+  }
+
   public BigDecimal calculateRating(Apartment apartment) {
     return new BigDecimal(
         (apartment.getSqft() / apartment.getPrice()) * rate,
diff --git a/rating-service/src/main/resources/application.properties b/rating-service/src/main/resources/application.properties
@@ -1,2 +1,2 @@
 server.port=8081
-spring.application.name=rating-service
+spring.application.name=rating-service

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`rate=10`
	`2`	`+maxAllowedApartmentsPerRealtor=5`