postgres default

Signed-off-by: plutov <[email protected]>

Author: plutov

.github/workflows/fly-deploy.yml

@@ -32,10 +32,6 @@ This approach offers a number of advantages, including:
 - [ ] Advanced question types
 - [ ] Pipe answers into the following questions
 
-## Demo
-
-[Demo admin panel](https://formulosity.vercel.app/app). Credentials: `user` / `pass`
-
 ## Survey Structure
 
 Each directory in `SURVEYS_DIR` is a survey. You can configure the source of your surveys by setting different `SURVEYS_DIR` env var.
@@ -295,8 +291,6 @@ You can deploy individual services to any cloud provider or self host them.
 - Next.js frontend. It's also packaged as a Docker container, but also can be deployed to Vercel for example.
 - [Optional] Postgres database. You can use managed Postgres services or deploy it yourself.
 
-The demo service (links above) is deployed to Fly.io (Go, SQLite) and Vercel (Next.js) and are under the free tiers.
-
 ### Environment Variables
 
 API:

README.md

@@ -6,54 +6,50 @@ CREATE TYPE survey_parse_statuses AS ENUM ('success', 'error', 'deleted');
 
 CREATE TYPE survey_delivery_statuses AS ENUM ('launched', 'stopped');
 
-CREATE TABLE
-    surveys (
-        id serial NOT NULL PRIMARY KEY,
-        uuid uuid NOT NULL DEFAULT uuid_generate_v4 () UNIQUE,
-        created_at timestamp without time zone default (now () at time zone 'utc'),
-        parse_status survey_parse_statuses,
-        delivery_status survey_delivery_statuses,
-        error_log TEXT,
-        name varchar(32) NOT NULL UNIQUE,
-        url_slug varchar(1024) NOT NULL UNIQUE,
-        config JSONB
-    );
+CREATE TABLE surveys (
+  id serial NOT NULL PRIMARY KEY,
+  uuid uuid NOT NULL DEFAULT uuid_generate_v4 () UNIQUE,
+  created_at timestamp without time zone default (now () at time zone 'utc'),
+  parse_status survey_parse_statuses,
+  delivery_status survey_delivery_statuses,
+  error_log TEXT,
+  name varchar(32) NOT NULL UNIQUE,
+  url_slug varchar(1024) NOT NULL UNIQUE,
+  config JSONB
+);
 
 CREATE TYPE surveys_sessions_status AS ENUM ('in_progress', 'completed');
 
-CREATE TABLE
-    surveys_sessions (
-        id serial NOT NULL PRIMARY KEY,
-        uuid uuid NOT NULL DEFAULT uuid_generate_v4 () UNIQUE,
-        created_at timestamp without time zone default (now () at time zone 'utc'),
-        completed_at timestamp without time zone,
-        status surveys_sessions_status,
-        survey_id integer NOT NULL,
-        ip_addr varchar(512) NULL,
-        CONSTRAINT fk_surveys_sessions1 FOREIGN KEY (survey_id) REFERENCES surveys (id) ON DELETE CASCADE
-    );
-
-CREATE TABLE
-    surveys_questions (
-        id serial NOT NULL PRIMARY KEY,
-        uuid uuid NOT NULL DEFAULT uuid_generate_v4 () UNIQUE,
-        survey_id integer NOT NULL,
-        question_id varchar(256) NOT NULL,
-        CONSTRAINT fk_surveys_questions1 FOREIGN KEY (survey_id) REFERENCES surveys (id) ON DELETE CASCADE
-    );
+CREATE TABLE surveys_sessions (
+  id serial NOT NULL PRIMARY KEY,
+  uuid uuid NOT NULL DEFAULT uuid_generate_v4 () UNIQUE,
+  created_at timestamp without time zone default (now () at time zone 'utc'),
+  completed_at timestamp without time zone,
+  status surveys_sessions_status,
+  survey_id integer NOT NULL,
+  ip_addr varchar(512) NULL,
+  CONSTRAINT fk_surveys_sessions1 FOREIGN KEY (survey_id) REFERENCES surveys (id) ON DELETE CASCADE
+);
+
+CREATE TABLE surveys_questions (
+  id serial NOT NULL PRIMARY KEY,
+  uuid uuid NOT NULL DEFAULT uuid_generate_v4 () UNIQUE,
+  survey_id integer NOT NULL,
+  question_id varchar(256) NOT NULL,
+  CONSTRAINT fk_surveys_questions1 FOREIGN KEY (survey_id) REFERENCES surveys (id) ON DELETE CASCADE
+);
 
 CREATE UNIQUE INDEX surveys_questions_id ON surveys_questions (survey_id, question_id);
 
-CREATE TABLE
-    surveys_answers (
-        id serial NOT NULL PRIMARY KEY,
-        uuid uuid NOT NULL DEFAULT uuid_generate_v4 () UNIQUE,
-        created_at timestamp without time zone default (now () at time zone 'utc'),
-        session_id integer NOT NULL,
-        question_id integer NOT NULL,
-        answer JSONB,
-        CONSTRAINT fk_surveys_answers1 FOREIGN KEY (session_id) REFERENCES surveys_sessions (id) ON DELETE CASCADE,
-        CONSTRAINT fk_surveys_answers2 FOREIGN KEY (question_id) REFERENCES surveys_questions (id) ON DELETE CASCADE
-    );
+CREATE TABLE surveys_answers (
+  id serial NOT NULL PRIMARY KEY,
+  uuid uuid NOT NULL DEFAULT uuid_generate_v4 () UNIQUE,
+  created_at timestamp without time zone default (now () at time zone 'utc'),
+  session_id integer NOT NULL,
+  question_id integer NOT NULL,
+  answer JSONB,
+  CONSTRAINT fk_surveys_answers1 FOREIGN KEY (session_id) REFERENCES surveys_sessions (id) ON DELETE CASCADE,
+  CONSTRAINT fk_surveys_answers2 FOREIGN KEY (question_id) REFERENCES surveys_questions (id) ON DELETE CASCADE
+);
 
 CREATE UNIQUE INDEX surveys_answers_unique ON surveys_answers (session_id, question_id);

api/migrations/postgres/000001_schema.up.sql

@@ -1,9 +1,9 @@
-CREATE TABLE
-    surveys_webhook_responses (
-        id serial NOT NULL PRIMARY KEY,
-        created_at timestamp without time zone default (now () at time zone 'utc'),
-        session_id integer NOT NULL,
-        response_status integer NOT NULL,
-        response TEXT,
-        CONSTRAINT fk_surveys_webhooks1 FOREIGN KEY (session_id) REFERENCES surveys_sessions (id) ON DELETE CASCADE,
-    );
+CREATE TABLE surveys_webhook_responses (
+  id serial NOT NULL PRIMARY KEY,
+  created_at timestamp without time zone default (now () at time zone 'utc'),
+  session_id integer NOT NULL,
+  response_status integer NOT NULL,
+  response TEXT,
+  CONSTRAINT fk_surveys_webhooks1 FOREIGN KEY (session_id) REFERENCES surveys_sessions (id) ON DELETE CASCADE
+);
+

api/migrations/postgres/000002_webhooks.up.sql

@@ -1,45 +1,45 @@
 CREATE TABLE surveys (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    uuid TEXT NOT NULL UNIQUE,
-    created_at TEXT,
-    parse_status TEXT,
-    delivery_status TEXT,
-    error_log TEXT,
-    name TEXT NOT NULL UNIQUE,
-    url_slug TEXT NOT NULL UNIQUE,
-    config TEXT
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  uuid TEXT NOT NULL UNIQUE,
+  created_at TEXT,
+  parse_status TEXT,
+  delivery_status TEXT,
+  error_log TEXT,
+  name TEXT NOT NULL UNIQUE,
+  url_slug TEXT NOT NULL UNIQUE,
+  config TEXT
 );
 
 CREATE TABLE surveys_sessions (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    uuid TEXT NOT NULL UNIQUE,
-    created_at TEXT,
-    completed_at TEXT,
-    status TEXT,
-    survey_id INTEGER NOT NULL,
-    ip_addr TEXT,
-    FOREIGN KEY (survey_id) REFERENCES surveys (id) ON DELETE CASCADE
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  uuid TEXT NOT NULL UNIQUE,
+  created_at TEXT,
+  completed_at TEXT,
+  status TEXT,
+  survey_id INTEGER NOT NULL,
+  ip_addr TEXT,
+  FOREIGN KEY (survey_id) REFERENCES surveys (id) ON DELETE CASCADE
 );
 
 CREATE TABLE surveys_questions (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    uuid TEXT NOT NULL UNIQUE,
-    survey_id INTEGER NOT NULL,
-    question_id TEXT NOT NULL,
-    FOREIGN KEY (survey_id) REFERENCES surveys (id) ON DELETE CASCADE
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  uuid TEXT NOT NULL UNIQUE,
+  survey_id INTEGER NOT NULL,
+  question_id TEXT NOT NULL,
+  FOREIGN KEY (survey_id) REFERENCES surveys (id) ON DELETE CASCADE
 );
 
 CREATE UNIQUE INDEX surveys_questions_id ON surveys_questions (survey_id, question_id);
 
 CREATE TABLE surveys_answers (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    uuid TEXT NOT NULL UNIQUE,
-    created_at TEXT,
-    session_id INTEGER NOT NULL,
-    question_id INTEGER NOT NULL,
-    answer TEXT,
-    FOREIGN KEY (session_id) REFERENCES surveys_sessions (id) ON DELETE CASCADE,
-    FOREIGN KEY (question_id) REFERENCES surveys_questions (id) ON DELETE CASCADE
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  uuid TEXT NOT NULL UNIQUE,
+  created_at TEXT,
+  session_id INTEGER NOT NULL,
+  question_id INTEGER NOT NULL,
+  answer TEXT,
+  FOREIGN KEY (session_id) REFERENCES surveys_sessions (id) ON DELETE CASCADE,
+  FOREIGN KEY (question_id) REFERENCES surveys_questions (id) ON DELETE CASCADE
 );
 
 CREATE UNIQUE INDEX surveys_answers_unique ON surveys_answers (session_id, question_id);

api/migrations/sqlite/000001_schema.up.sql

@@ -1,8 +1,9 @@
 CREATE TABLE surveys_webhook_responses (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    created_at TEXT,
-    session_id INTEGER NOT NULL,
-    response_status INTEGER NOT NULL,
-    response TEXT,
-    FOREIGN KEY (session_id) REFERENCES surveys_sessions (id) ON DELETE CASCADE
-);
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  created_at TEXT,
+  session_id INTEGER NOT NULL,
+  response_status INTEGER NOT NULL,
+  response TEXT,
+  FOREIGN KEY (session_id) REFERENCES surveys_sessions (id) ON DELETE CASCADE
+);
+

api/migrations/sqlite/000002_webhooks.up.sql

@@ -5,19 +5,18 @@ services:
       context: ./api
     ports:
       - "9900:8080"
-    # depends_on:
-    # - postgres
+    depends_on:
+      - postgres
     environment:
-      - DATABASE_TYPE=sqlite # postgres|sqlite
-      # - DATABASE_URL=postgres://postgres:postgres@postgres:5432/formulosity?sslmode=disable
-      - DATABASE_URL=/root/sqlite3/formulosity.db
+      - DATABASE_TYPE=postgres # postgres|sqlite
+      - DATABASE_URL=postgres://user:pass@postgres:5432/formulosity?sslmode=disable
+      # - DATABASE_URL=/root/sqlite3/formulosity.db
       - SURVEYS_DIR=/root/surveys
       - UPLOADS_DIR=/root/uploads
     volumes:
       - ./api/surveys:/root/surveys
       - ./api/sqlite3:/root/sqlite3
       - ./api/uploads:/root/uploads
-
   ui:
     restart: always
     build:
@@ -31,21 +30,19 @@ services:
       - HTTP_BASIC_AUTH=user:pass
     depends_on:
       - api
-
-  # postgres:
-  #   image: postgres:16.0-alpine
-  #   restart: always
-  #   environment:
-  #     - POSTGRES_USER=postgres
-  #     - POSTGRES_PASSWORD=postgres
-  #     - POSTGRES_DB=formulosity
-  #   ports:
-  #     - "5432:5432"
-  #   volumes:
-  #     - ./api/postgres-data:/var/lib/postgresql/data
-  #   logging:
-  #     driver: none
-
+  postgres:
+    image: postgres:16.0-alpine
+    restart: always
+    environment:
+      - POSTGRES_USER=user
+      - POSTGRES_PASSWORD=pass
+      - POSTGRES_DB=formulosity
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./api/postgres-data:/var/lib/postgresql/data
+    logging:
+      driver: none
 volumes:
   dbvolume:
     driver: local