Merge for review

connection.py

@@ -0,0 +1,74 @@
+import csv
+import os
+import psycopg2
+import psycopg2.extras
+
+
+def csv_to_dict(file_path):
+    with open(file_path, 'r', newline='') as f:
+        reader = csv.DictReader(f)
+        database = [dict(row) for row in reader]
+    return database
+
+
+def dict_to_csv(file_path, data, is_answers=False):
+    with open(file_path, 'w', newline='') as f:
+        writer = csv.DictWriter(f, ANSWER_DATA_HEADER if is_answers else QUESTION_DATA_HEADER)
+        writer.writeheader()
+        writer.writerows(data)
+
+
+def append_to_csv(file_path, data):
+    with open(file_path, 'a', newline='') as f:
+        writer = csv.writer(f)
+        writer.writerows([data.values()])
+
+
+# Creates a decorator to handle the database connection/cursor opening/closing.
+# Creates the cursor with RealDictCursor, thus it returns real dictionaries, where the column names are the keys.
+
+
+def get_connection_string():
+    # setup connection string
+    # to do this, please define these environment variables first
+    user_name = os.environ.get('PSQL_USER_NAME')
+    password = os.environ.get('PSQL_PASSWORD')
+    host = os.environ.get('PSQL_HOST')
+    database_name = os.environ.get('PSQL_DB_NAME')
+
+    env_variables_defined = user_name and password and host and database_name
+
+    if env_variables_defined:
+        # this string describes all info for psycopg2 to connect to the database
+        return 'postgresql://{user_name}:{password}@{host}/{database_name}'.format(
+            user_name=user_name,
+            password=password,
+            host=host,
+            database_name=database_name
+        )
+    else:
+        raise KeyError('Some necessary environment variable(s) are not defined')
+
+
+def open_database():
+    try:
+        connection_string = get_connection_string()
+        connection = psycopg2.connect(connection_string)
+        connection.autocommit = True
+    except psycopg2.DatabaseError as exception:
+        print('Database connection problem')
+        raise exception
+    return connection
+
+
+def connection_handler(function):
+    def wrapper(*args, **kwargs):
+        connection = open_database()
+        # we set the cursor_factory parameter to return with a RealDictCursor cursor (cursor which provide dictionaries)
+        dict_cur = connection.cursor(cursor_factory=psycopg2.extras.RealDictCursor)
+        ret_value = function(dict_cur, *args, **kwargs)
+        dict_cur.close()
+        connection.close()
+        return ret_value
+
+    return wrapper

data/answer.csv

@@ -0,0 +1,3 @@
+id,submission_time,vote_number,question_id,message,image
+0,1493398154,4,0,"You need to use brackets: my_list = []",
+1,1493088154,35,0,"Look it up in the Python docs",

data/question.csv

@@ -0,0 +1,14 @@
+id,submission_time,view_number,vote_number,title,message,image
+0,1493368154,29,7,"How to make lists in Python?","I am totally new to this, any hints?",
+1,1493068124,15,9,"Wordpress loading multiple jQuery Versions","I developed a plugin that uses the jquery booklet plugin (http://builtbywill.com/booklet/#/) this plugin binds a function to $ so I cann call $('.myBook').booklet();
+
+I could easy managing the loading order with wp_enqueue_script so first I load jquery then I load booklet so everything is fine.
+
+BUT in my theme i also using jquery via webpack so the loading order is now following:
+
+jquery
+booklet
+app.js (bundled file with webpack, including jquery)","images/image1.png"
+2,1493015432,1364,57,"Drawing canvas with an image picked with Cordova Camera Plugin","I'm getting an image from device and drawing a canvas with filters using Pixi JS. It works all well using computer to get an image. But when I'm on IOS, it throws errors such as cross origin issue, or that I'm trying to use an unknown format.
+
+This is the code I'm using to draw the image (that works on web/desktop but not cordova built ios app)",

data_handler.py

@@ -0,0 +1,146 @@
+import os
+from datetime import datetime
+
+from psycopg2 import sql
+
+import connection
+from util import string_builder
+
+ANSWER_DATA_FILE_PATH = os.getcwd() + "/data/answer.csv"
+QUESTION_DATA_FILE_PATH = os.getcwd() + "/data/question.csv"
+
+
+def get_answers():
+    database = connection.csv_to_dict(ANSWER_DATA_FILE_PATH)
+    return database
+
+
+def get_questions():
+    database = connection.csv_to_dict(QUESTION_DATA_FILE_PATH)
+    return database
+
+
+def save_questions(data):
+    database = connection.dict_to_csv(QUESTION_DATA_FILE_PATH, data)
+    return database
+
+
+def save_answers(data):
+    database = connection.dict_to_csv(ANSWER_DATA_FILE_PATH, data, True)
+    return database
+
+
+def add_entry(entry, is_answer=False):
+    table = "answer"
+    if not is_answer:
+        table = "question"
+
+    entry = escape_single_quotes(entry)
+    query = """INSERT INTO {table}
+    ({columns}) VALUES ({values});
+    """.format(columns=string_builder(entry.keys()),
+               values=string_builder(entry.values(), False),
+               table=table)
+    print(query)
+    execute_query(query)
+
+
+def get_question(question_id):
+    question_query = f"""SELECT * FROM question
+                         WHERE id={int(question_id)};"""
+    question_data = execute_query(question_query)
+    return question_data
+
+
+def get_answer(answer_id, answer_database):
+    for answer_data in answer_database:
+        if answer_data['id'] == answer_id:
+            return answer_data
+
+
+def get_question_related_answers(question_id):
+    answers_query = f"""SELECT * FROM answer
+                        WHERE question_id={int(question_id)}
+                        ORDER BY submission_time DESC;"""
+    answers_of_question = execute_query(answers_query)
+    return answers_of_question
+
+
+def update_record(record, is_answer=False):
+    table = "answer"
+    record = escape_single_quotes(record)
+    id_ = record['id']
+    if not is_answer:
+        table = "question"
+        query = f"""UPDATE {table}
+                    SET submission_time={"'" + record['submission_time'] + "'"},
+                        title={"'" + record['title'] + "'"},
+                        message={"'" + record['message'] + "'"},
+                        image={"'" + record['image'] + "'"}
+                    WHERE id={id_};
+                    """
+    else:
+        query = f"""UPDATE {table}
+            SET submission_time={"'" + record['submission_time'] + "'"},
+                message={"'" + record['title'] + "'"},
+                image={"'" + record['image'] + "'"}
+            WHERE id={id_};
+            """
+
+    execute_query(query)
+
+
+def delete_record(id, answer=False, delete=False):
+    if answer:
+        question_id_query = f"""SELECT question_id FROM answer
+                                WHERE id={id};"""
+        delete_answer_query = f"""DELETE FROM answer
+                                  WHERE id={id};"""
+        delete_comment_query = f"""DELETE FROM comment
+                                  WHERE answer_id={id};"""
+        question_id = execute_query(question_id_query)[0]['question_id']
+
+        if delete:
+            execute_query(delete_comment_query)
+            execute_query(delete_answer_query)
+
+        return question_id
+
+
+@connection.connection_handler
+def execute_query(cursor, query):
+    # print(query.startswith("INSERT"))
+    if query.startswith("SELECT"):
+        cursor.execute(
+            sql.SQL(query)
+        )
+        result = cursor.fetchall()
+
+    else:
+        result = cursor.execute(query)
+    return result
+
+
+def handle_add_comment(req):
+    req.update(submission_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
+    query ="""INSERT INTO comment ({columns}) 
+    VALUES ({value_list})""".format(columns=string_builder(req.keys(), True),
+                                    value_list=string_builder(req.values(), False)
+                                    )
+    execute_query(query)
+
+
+def escape_single_quotes(dictionary):
+    for key, value in dictionary.items():
+        if type(value) == str and "'" in value:
+            dictionary[key] = value.replace("'", "''")
+    return dictionary
+
+
+def get_comments(comment_tpe, _id):
+    comment_tpe += "_id"
+    query = """SELECT message, submission_time, edited_count  FROM comment
+    WHERE {col} = {id} 
+    """.format(col=comment_tpe, id=_id)
+    print(query)
+    return execute_query(query)

sample_data/askmatepart2-sample-data.sql

@@ -0,0 +1,127 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 9.5.6
+-- Dumped by pg_dump version 9.5.6
+
+ALTER TABLE IF EXISTS ONLY public.question DROP CONSTRAINT IF EXISTS pk_question_id CASCADE;
+ALTER TABLE IF EXISTS ONLY public.answer DROP CONSTRAINT IF EXISTS pk_answer_id CASCADE;
+ALTER TABLE IF EXISTS ONLY public.answer DROP CONSTRAINT IF EXISTS fk_question_id CASCADE;
+ALTER TABLE IF EXISTS ONLY public.comment DROP CONSTRAINT IF EXISTS pk_comment_id CASCADE;
+ALTER TABLE IF EXISTS ONLY public.comment DROP CONSTRAINT IF EXISTS fk_question_id CASCADE;
+ALTER TABLE IF EXISTS ONLY public.comment DROP CONSTRAINT IF EXISTS fk_answer_id CASCADE;
+ALTER TABLE IF EXISTS ONLY public.question_tag DROP CONSTRAINT IF EXISTS pk_question_tag_id CASCADE;
+ALTER TABLE IF EXISTS ONLY public.question_tag DROP CONSTRAINT IF EXISTS fk_question_id CASCADE;
+ALTER TABLE IF EXISTS ONLY public.tag DROP CONSTRAINT IF EXISTS pk_tag_id CASCADE;
+ALTER TABLE IF EXISTS ONLY public.question_tag DROP CONSTRAINT IF EXISTS fk_tag_id CASCADE;
+
+DROP TABLE IF EXISTS public.question;
+DROP SEQUENCE IF EXISTS public.question_id_seq;
+CREATE TABLE question (
+    id serial NOT NULL,
+    submission_time timestamp without time zone,
+    view_number integer,
+    vote_number integer,
+    title text,
+    message text,
+    image text
+);
+
+DROP TABLE IF EXISTS public.answer;
+DROP SEQUENCE IF EXISTS public.answer_id_seq;
+CREATE TABLE answer (
+    id serial NOT NULL,
+    submission_time timestamp without time zone,
+    vote_number integer,
+    question_id integer,
+    message text,
+    image text
+);
+
+DROP TABLE IF EXISTS public.comment;
+DROP SEQUENCE IF EXISTS public.comment_id_seq;
+CREATE TABLE comment (
+    id serial NOT NULL,
+    question_id integer,
+    answer_id integer,
+    message text,
+    submission_time timestamp without time zone,
+    edited_count integer
+);
+
+
+DROP TABLE IF EXISTS public.question_tag;
+CREATE TABLE question_tag (
+    question_id integer NOT NULL,
+    tag_id integer NOT NULL
+);
+
+DROP TABLE IF EXISTS public.tag;
+DROP SEQUENCE IF EXISTS public.tag_id_seq;
+CREATE TABLE tag (
+    id serial NOT NULL,
+    name text
+);
+
+
+ALTER TABLE ONLY answer
+    ADD CONSTRAINT pk_answer_id PRIMARY KEY (id);
+
+ALTER TABLE ONLY comment
+    ADD CONSTRAINT pk_comment_id PRIMARY KEY (id);
+
+ALTER TABLE ONLY question
+    ADD CONSTRAINT pk_question_id PRIMARY KEY (id);
+
+ALTER TABLE ONLY question_tag
+    ADD CONSTRAINT pk_question_tag_id PRIMARY KEY (question_id, tag_id);
+
+ALTER TABLE ONLY tag
+    ADD CONSTRAINT pk_tag_id PRIMARY KEY (id);
+
+ALTER TABLE ONLY comment
+    ADD CONSTRAINT fk_answer_id FOREIGN KEY (answer_id) REFERENCES answer(id);
+
+ALTER TABLE ONLY answer
+    ADD CONSTRAINT fk_question_id FOREIGN KEY (question_id) REFERENCES question(id);
+
+ALTER TABLE ONLY question_tag
+    ADD CONSTRAINT fk_question_id FOREIGN KEY (question_id) REFERENCES question(id);
+
+ALTER TABLE ONLY comment
+    ADD CONSTRAINT fk_question_id FOREIGN KEY (question_id) REFERENCES question(id);
+
+ALTER TABLE ONLY question_tag
+    ADD CONSTRAINT fk_tag_id FOREIGN KEY (tag_id) REFERENCES tag(id);
+
+INSERT INTO question VALUES (0, '2017-04-28 08:29:00', 29, 7, 'How to make lists in Python?', 'I am totally new to this, any hints?', NULL);
+INSERT INTO question VALUES (1, '2017-04-29 09:19:00', 15, 9, 'Wordpress loading multiple jQuery Versions', 'I developed a plugin that uses the jquery booklet plugin (http://builtbywill.com/booklet/#/) this plugin binds a function to $ so I cann call $(".myBook").booklet();
+
+I could easy managing the loading order with wp_enqueue_script so first I load jquery then I load booklet so everything is fine.
+
+BUT in my theme i also using jquery via webpack so the loading order is now following:
+
+jquery
+booklet
+app.js (bundled file with webpack, including jquery)', 'images/image1.png');
+INSERT INTO question VALUES (2, '2017-05-01 10:41:00', 1364, 57, 'Drawing canvas with an image picked with Cordova Camera Plugin', 'I''m getting an image from device and drawing a canvas with filters using Pixi JS. It works all well using computer to get an image. But when I''m on IOS, it throws errors such as cross origin issue, or that I''m trying to use an unknown format.
+', NULL);
+SELECT pg_catalog.setval('question_id_seq', 2, true);
+
+INSERT INTO answer VALUES (1, '2017-04-28 16:49:00', 4, 1, 'You need to use brackets: my_list = []', NULL);
+INSERT INTO answer VALUES (2, '2017-04-25 14:42:00', 35, 1, 'Look it up in the Python docs', 'images/image2.jpg');
+SELECT pg_catalog.setval('answer_id_seq', 2, true);
+
+INSERT INTO comment VALUES (1, 0, NULL, 'Please clarify the question as it is too vague!', '2017-05-01 05:49:00');
+INSERT INTO comment VALUES (2, NULL, 1, 'I think you could use my_list = list() as well.', '2017-05-02 16:55:00');
+SELECT pg_catalog.setval('comment_id_seq', 2, true);
+
+INSERT INTO tag VALUES (1, 'python');
+INSERT INTO tag VALUES (2, 'sql');
+INSERT INTO tag VALUES (3, 'css');
+SELECT pg_catalog.setval('tag_id_seq', 3, true);
+
+INSERT INTO question_tag VALUES (0, 1);
+INSERT INTO question_tag VALUES (1, 3);
+INSERT INTO question_tag VALUES (2, 3);