diff --git a/account_database/schema.sql b/account_database/schema.sql index c961c3f63b6d337a1afa24909659f3c79d559b6c..2b71ebcd7a47e65771cd1d44cc5267d427366300 100644 --- a/account_database/schema.sql +++ b/account_database/schema.sql @@ -5,9 +5,9 @@ CREATE TABLE IF NOT EXISTS users ( created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ); -CREATE TABLE IF NOT EXISTS account_events { +CREATE TABLE IF NOT EXISTS account_events ( user_id INT NOT NULL, event_id INT, PRIMARY KEY (user_id, event_id), FOREIGN KEY (user_id) REFERENCES users(user_id) -}; \ No newline at end of file +); \ No newline at end of file diff --git a/frontend_microservice/frontend.py b/frontend_microservice/frontend.py index ce0305fcf25eb28306d746647928ad14147ccf3d..886aa30042d1d3558ba40ec538eb3301aa5e7254 100644 --- a/frontend_microservice/frontend.py +++ b/frontend_microservice/frontend.py @@ -152,11 +152,12 @@ def get_events(account_id): event['name'] = data_output['name'] event['url'] = url_for('eventSummary', event_id=event_id) events.append(event) - + ''' #Test data event1= {'name':'An event','url':url_for('eventSummary', event_id=1)} event2= {'name':'An event 2','url':'a url'} events = [event1, event2] + ''' return render_template('accountEvents.html', event=events) return render_template('accountEvents.html')