Merge remote-tracking branch 'origin/master'

README.MD

@@ -18,7 +18,18 @@ Config Server:
 * install npm
 * install Angular cli
 
+
+Run services in local r8s:
+
+skaffold dev --port-forward --trigger=manual --no-prune
+
+Install postgres to k8s
+
+helm install pg-release -f data-service/k8s/pg_values.yaml bitnami/postgresql
+
+
 Design prototype:
+
 https://ninjamock.com/s/HMR47Wx
 
 

data-service/k8s_pg/pg_values.yaml

@@ -0,0 +1,2 @@
+postgresqlUsername: user
+postgresqlPassword: example

data-service/src/main/java/com/relay/core/service/RelayService.java

@@ -1,23 +1,20 @@
 package com.relay.core.service;
 
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.util.List;
-
-import javax.transaction.Transactional;
-
+import com.relay.core.mappers.RelayMapper;
+import com.relay.db.repository.RelayRepository;
+import com.relay.web.model.Relay;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
-import com.relay.core.mappers.RelayMapper;
-import com.relay.db.repository.RelayRepository;
-import com.relay.web.model.Relay;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import javax.transaction.Transactional;
+import java.math.BigInteger;
+import java.time.LocalDate;
+import java.util.List;
 
 /**
  * {@link Relay} service
@@ -55,7 +52,7 @@ public List<Relay> findAll(Pageable pageable) {
      */
     public Relay save(Relay relay) {
 
-        com.relay.db.entity.items.Relay entity = RelayMapper.INSTANCE.mapModelToEntity(relay);
+        com.relay.db.entity.items.Relay entity      = relayMapper.mapModelToEntity(relay);
         com.relay.db.entity.items.Relay savedEntity = relayRepository.save(entity);
         return relayMapper.mapEntityToModel(savedEntity);
     }

data-service/src/main/java/com/relay/web/model/Relay.java

@@ -7,32 +7,19 @@
 import javax.validation.constraints.Size;
 import java.time.OffsetDateTime;
 
-@ApiModel(description = "Relay details.")
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
+@ApiModel(description = "Relay details.")
 public class Relay {
 
-    /**
-     * Date of manufacture relay
-     */
     @ApiModelProperty(notes = "Date of manufacture relay")
-    private OffsetDateTime dateOfManufacture;
-
-    /**
-     * Relay verification date
-     */
+    OffsetDateTime dateOfManufacture;
     @ApiModelProperty(notes = "Verification date relay")
-    private OffsetDateTime verificationDate;
-
-    /**
-     * Relay serial number
-     */
+    OffsetDateTime verificationDate;
     @ApiModelProperty(notes = "Serial number relay")
     @NonNull
-    @Size(min = 5,
-            message = "Serial number should contain at least five characters")
-    private String serialNumber;
-
+    @Size(min = 5, message = "Serial number should contain at least five characters")
+    String         serialNumber;
 }

data-service/src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: relay-service
   datasource:
-    url: jdbc:postgresql://192.168.1.150:5432/postgres
+    url: jdbc:postgresql://pg-release-postgresql.relay-ns.svc.cluster.local:5432/postgres
     username: user
     password: example
   jpa: