Skip to content

Commit

Permalink
bug fixings*
Browse files Browse the repository at this point in the history
  • Loading branch information
anatolicvs committed Apr 17, 2020
1 parent 1e315c6 commit 56e2fa6
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 49 deletions.
Binary file added .metals/metals.h2.db
Binary file not shown.
12 changes: 12 additions & 0 deletions .metals/metals.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
INFO started: Metals version 0.8.4 in workspace '/home/magnusanatolius/works/in-sylva.infrastructure'
INFO time: initialize in 0.34s
WARN no build tool detected in workspace '/home/magnusanatolius/works/in-sylva.infrastructure'. The most common cause for this problem is that the editor was opened in the wrong working directory, for example if you use sbt then the workspace directory should contain build.sbt.
Apr 16, 2020 7:22:58 PM org.eclipse.lsp4j.jsonrpc.services.GenericEndpoint notify
INFO: Unsupported notification method: $/setTraceNotification
Apr 16, 2020 7:22:59 PM org.eclipse.lsp4j.jsonrpc.services.GenericEndpoint notify
INFO: Unsupported notification method: $/setTraceNotification
Apr 16, 2020 7:23:04 PM org.eclipse.lsp4j.jsonrpc.services.GenericEndpoint notify
INFO: Unsupported notification method: $/setTraceNotification
Apr 16, 2020 7:23:04 PM org.eclipse.lsp4j.jsonrpc.services.GenericEndpoint notify
INFO: Unsupported notification method: $/setTraceNotification
INFO shutting down Metals
100 changes: 51 additions & 49 deletions data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS users (

CREATE TABLE IF NOT EXISTS sources (
id serial PRIMARY KEY,
index_id varchar(50) NOT NULL,
index_id varchar(50),
mng_id varchar(50) NOT NULL,
name varchar(50) NOT NULL ,
description text,
Expand All @@ -23,54 +23,6 @@ CREATE TABLE IF NOT EXISTS sources (
update_at timestamp
);

create unique index sources_name_uindex
on sources (name);

CREATE TABLE IF NOT EXISTS user_profile (
id serial PRIMARY KEY,
profil_name varchar(100),
kc_id varchar(100),

CONSTRAINT user_profile_kc_id FOREIGN KEY (kc_id)
REFERENCES users(kc_id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,

create_at timestamp NOT NULL DEFAULT NOW(),
update_at timestamp
);

CREATE TABLE IF NOT EXISTS field_specifications (
id serial PRIMARY KEY,
std_field_id int,
addtl_field_id int,
kc_id varchar(100),

CONSTRAINT field_specifications_std_field_id FOREIGN KEY (std_field_id)
REFERENCES std_fields(id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,

CONSTRAINT field_specifications_addtl_field_id FOREIGN KEY (addtl_field_id)
REFERENCES addtl_fields(id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,

CONSTRAINT field_specifications_kc_id FOREIGN KEY (kc_id)
REFERENCES users(kc_id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,

create_at timestamp NOT NULL DEFAULT NOW(),
update_at timestamp
);

CREATE TABLE IF NOT EXISTS profile_specifications(
profil_id int,
field_specification_id int,

CONSTRAINT profile_specifications_profil_id FOREIGN KEY (profil_id)
REFERENCES user_profile(id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,

CONSTRAINT field_specifications_field_specification_id FOREIGN KEY (field_specification_id)
REFERENCES field_specifications(id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,

create_at timestamp NOT NULL DEFAULT NOW(),
update_at timestamp
);

CREATE table IF NOT EXISTS provider_sources (
id serial PRIMARY KEY,
user_id integer NOT NULL,
Expand Down Expand Up @@ -263,6 +215,56 @@ CREATE table IF NOT EXISTS user_search_his(
create_at timestamp NOT NULL DEFAULT NOW(),
update_at timestamp
);

create unique index sources_name_uindex
on sources (name);

CREATE TABLE IF NOT EXISTS user_profile (
id serial PRIMARY KEY,
profil_name varchar(100),
kc_id varchar(100),

CONSTRAINT user_profile_kc_id FOREIGN KEY (kc_id)
REFERENCES users(kc_id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,

create_at timestamp NOT NULL DEFAULT NOW(),
update_at timestamp
);

CREATE TABLE IF NOT EXISTS field_specifications (
id serial PRIMARY KEY,
std_field_id int,
addtl_field_id int,
kc_id varchar(100),

CONSTRAINT field_specifications_std_field_id FOREIGN KEY (std_field_id)
REFERENCES std_fields(id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,

CONSTRAINT field_specifications_addtl_field_id FOREIGN KEY (addtl_field_id)
REFERENCES addtl_fields(id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,

CONSTRAINT field_specifications_kc_id FOREIGN KEY (kc_id)
REFERENCES users(kc_id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,

create_at timestamp NOT NULL DEFAULT NOW(),
update_at timestamp
);

CREATE TABLE IF NOT EXISTS profile_specifications(
profil_id int,
field_specification_id int,

CONSTRAINT profile_specifications_profil_id FOREIGN KEY (profil_id)
REFERENCES user_profile(id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,

CONSTRAINT field_specifications_field_specification_id FOREIGN KEY (field_specification_id)
REFERENCES field_specifications(id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,

create_at timestamp NOT NULL DEFAULT NOW(),
update_at timestamp
);


/*
CREATE OR REPLACE FUNCTION func_role_updater() RETURNS TRIGGER AS $BODY$
BEGIN
Expand Down
5 changes: 5 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,18 @@ services:
ELK_USERNAME: admin
ELK_PASSWORD: InSylva146544

KEYCLOAK_REALM: "in-sylva"
SERVER_URL: http://keycloak:8080/keycloak/auth
CLIENT_ID: "in-sylva.user.app"

PORT: 5000
ports:
- 5000:5000
links:
- mongo
- postgres
- odfe-node1
- keycloak
networks:
- app-network
restart: unless-stopped
Expand Down

0 comments on commit 56e2fa6

Please sign in to comment.