Fixed database query and fixed docker-compose

This commit is contained in:
Diego Rubio
2020-11-26 23:42:55 +01:00
parent bf96b88ae5
commit 385d2d909a
4 changed files with 18 additions and 16 deletions

View File

@@ -1,7 +1,7 @@
DROP TABLE IF EXISTS phones; DROP TABLE IF EXISTS phones;
CREATE TABLE phones ( CREATE TABLE phones (
id INT AUTO_INCREMENT PRIMARY KEY, id_phone INT AUTO_INCREMENT PRIMARY KEY,
creation_date VARCHAR(250) NOT NULL, creation_date VARCHAR(250) NOT NULL,
name VARCHAR(250) NOT NULL, name VARCHAR(250) NOT NULL,
model VARCHAR(250) NOT NULL, model VARCHAR(250) NOT NULL,

View File

@@ -22,7 +22,7 @@ public class FindPhoneService {
public PhoneResponse findByName(String name) throws PhoneNotFoundException { public PhoneResponse findByName(String name) throws PhoneNotFoundException {
Optional<Phone> phone = phoneRepository.findByName(name); Optional<Phone> phone = phoneRepository.findByName(name);
if(phone.isPresent()) { if(!phone.isPresent()) {
throw new PhoneNotFoundException(name, "Phone not found"); throw new PhoneNotFoundException(name, "Phone not found");
} }
log.info("Find phone: {}", phone); log.info("Find phone: {}", phone);

View File

@@ -1,7 +1,7 @@
DROP TABLE IF EXISTS phones; DROP TABLE IF EXISTS phones;
CREATE TABLE phones ( CREATE TABLE phones (
id INT AUTO_INCREMENT PRIMARY KEY, id_phone INT AUTO_INCREMENT PRIMARY KEY,
creation_date VARCHAR(250) NOT NULL, creation_date VARCHAR(250) NOT NULL,
name VARCHAR(250) NOT NULL, name VARCHAR(250) NOT NULL,
model VARCHAR(250) NOT NULL, model VARCHAR(250) NOT NULL,

View File

@@ -1,7 +1,4 @@
version: '2.1' version: '3'
networks:
test:
services: services:
zoo1: zoo1:
@@ -10,7 +7,7 @@ services:
ports: ports:
- "2181:2181" - "2181:2181"
networks: networks:
- test - kafka_net
environment: environment:
ZOO_MY_ID: 1 ZOO_MY_ID: 1
ZOO_PORT: 2181 ZOO_PORT: 2181
@@ -23,12 +20,13 @@ services:
image: confluentinc/cp-kafka:5.5.1 image: confluentinc/cp-kafka:5.5.1
hostname: kafka1 hostname: kafka1
ports: ports:
- "9092:9092" - "29092:29092"
environment: environment:
KAFKA_ADVERTISED_LISTENERS: LISTENER_DOCKER_INTERNAL://kafka1:19092,LISTENER_DOCKER_EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9092 KAFKA_ADVERTISED_HOST_NAME: kafka
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka1:9092,PLAINTEXT_HOST://localhost:29092
KAFKA_CREATE_TOPICS: create-phone:2:1 KAFKA_CREATE_TOPICS: create-phone:2:1
KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_DOCKER_INTERNAL
KAFKA_ZOOKEEPER_CONNECT: "zoo1:2181" KAFKA_ZOOKEEPER_CONNECT: "zoo1:2181"
KAFKA_BROKER_ID: 1 KAFKA_BROKER_ID: 1
KAFKA_LOG4J_LOGGERS: "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO" KAFKA_LOG4J_LOGGERS: "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO"
@@ -38,7 +36,7 @@ services:
depends_on: depends_on:
- zoo1 - zoo1
networks: networks:
- test - kafka_net
healthcheck: healthcheck:
test: [ "CMD", "nc", "-vz", "localhost", "9092" ] test: [ "CMD", "nc", "-vz", "localhost", "9092" ]
interval: 30s interval: 30s
@@ -57,7 +55,7 @@ services:
kafka1: kafka1:
condition: service_healthy condition: service_healthy
networks: networks:
- test - kafka_net
demo-query-1: demo-query-1:
build: build:
@@ -71,7 +69,7 @@ services:
kafka1: kafka1:
condition: service_healthy condition: service_healthy
networks: networks:
- test - kafka_net
demo-query-2: demo-query-2:
build: build:
@@ -85,4 +83,8 @@ services:
kafka1: kafka1:
condition: service_healthy condition: service_healthy
networks: networks:
- test - kafka_net
networks:
kafka_net:
driver: bridge