Revert "feat: New schema for reviews backend. | NPG-000 (#731)"

This reverts commit 54c4738.

Author: kukkok3

docker/voting-node.dockerfile

@@ -8,7 +8,7 @@ FROM jormungandr:latest as jorm
 
 # stage 3
 FROM python as poetry
-RUN pip install poetry==2.0.1
+RUN pip install poetry==1.8.0
 
 # Add python codebase
 COPY . /voting

services/voting-node/Earthfile

@@ -21,7 +21,7 @@ builder:
             zlib1g-dev
 
     # Install Poetry
-    RUN curl -sSL https://install.python-poetry.org | python3 - --version 2.0.1
+    RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.0
 
     SAVE IMAGE --cache-hint
 
@@ -42,7 +42,6 @@ deps:
     RUN poetry config installer.max-workers 10
     # Install package dependencies without the voting_node package
     RUN poetry install --only main --no-root
-    RUN poetry self add poetry-plugin-export
 
     # Copy the voting_node source code
     COPY --dir voting_node README.md ./

src/event-db/migrations/V11__reviews.sql

@@ -99,47 +99,52 @@ COMMENT ON COLUMN reviewer_level.event_id IS 'The specific Event ID this review
 CREATE TABLE proposal_review (
   row_id SERIAL PRIMARY KEY,
   proposal_id INTEGER NOT NULL,
-  user_id INTEGER NOT NULL,
   assessor VARCHAR NOT NULL,
   assessor_level INTEGER,
+  reward_address TEXT,
 
+  -- These fields are deprecated and WILL BE removed in a future migration.
+  -- They MUST only be used for Vit-SS compatibility.
   impact_alignment_rating_given INTEGER,
   impact_alignment_note VARCHAR,
   feasibility_rating_given INTEGER,
   feasibility_note VARCHAR,
   auditability_rating_given INTEGER,
   auditability_note VARCHAR,
-  allocated INTEGER,
   ranking INTEGER,
   flags JSONB NULL,
 
-  FOREIGN KEY (user_id) REFERENCES catalyst_user(row_id) ON DELETE SET NULL,
-  FOREIGN KEY (proposal_id) REFERENCES proposal(row_id) ON DELETE CASCADE
+  FOREIGN KEY (proposal_id) REFERENCES proposal(row_id) ON DELETE CASCADE,
+  FOREIGN KEY (assessor_level) REFERENCES reviewer_level(row_id) ON DELETE CASCADE
 );
 
 COMMENT ON TABLE proposal_review IS 'All Reviews.';
 COMMENT ON COLUMN proposal_review.row_id IS 'Synthetic Unique Key.';
-COMMENT ON COLUMN proposal_review.proposal_id IS 'The Proposal id this review belongs to.';
-COMMENT ON COLUMN proposal_review.user_id IS 'The user id this review belongs to.';
-COMMENT ON COLUMN proposal_review.assessor IS 'Assessors Anonymized ID.';
+COMMENT ON COLUMN proposal_review.proposal_id IS 'The Proposal this review is for.';
+COMMENT ON COLUMN proposal_review.assessor IS 'Assessors Anonymized ID';
 COMMENT ON COLUMN proposal_review.assessor_level IS 'Assessors level ID';
+COMMENT ON COLUMN proposal_review.reward_address IS 'Assessors reward address';
 
 COMMENT ON COLUMN proposal_review.impact_alignment_rating_given IS
-'The  numeric rating assigned to the proposal by the assessor.';
+'The  numeric rating assigned to the proposal by the assessor.
+DEPRECATED: Only used for Vit-SS compatibility.';
 COMMENT ON COLUMN proposal_review.impact_alignment_note IS
-'A note about why the impact rating was given.';
+'A note about why the impact rating was given.
+DEPRECATED: Only used for Vit-SS compatibility.';
+
 COMMENT ON COLUMN proposal_review.feasibility_rating_given IS
-'The numeric feasibility rating given.';
+'The numeric feasibility rating given.
+DEPRECATED: Only used for Vit-SS compatibility.';
 COMMENT ON COLUMN proposal_review.feasibility_note IS
-'A note about why the feasibility rating was given.';
+'A note about why the feasibility rating was given.
+DEPRECATED: Only used for Vit-SS compatibility.';
+
 COMMENT ON COLUMN proposal_review.auditability_rating_given IS
-'The numeric auditability rating given.';
+'The numeric auditability rating given.
+DEPRECATED: Only used for Vit-SS compatibility.';
 COMMENT ON COLUMN proposal_review.auditability_note IS
-'A note about the auditability rating given.';
-
-COMMENT ON COLUMN proposal_review.allocated IS
-'Describes if the review was part of the original reviewer allocation.
-';
+'A note about the auditability rating given.
+DEPRECATED: Only used for Vit-SS compatibility.';
 
 COMMENT ON COLUMN proposal_review.ranking IS
 'Numeric  Measure of quality of this review according to veteran community advisors.

src/event-db/migrations/V4__catalyst_id.sql

@@ -0,0 +1,42 @@
+-- Catalyst Event Database
+
+-- ModerationAllocation - Defines the relationship between users and proposals_reviews
+-- to describe the allocation of moderations that needs to be done.
+
+CREATE TABLE moderation_allocation (
+  row_id SERIAL PRIMARY KEY,
+  review_id INTEGER NOT NULL,
+  user_id INTEGER NOT NULL,
+
+  FOREIGN KEY (review_id) REFERENCES proposal_review(row_id) ON DELETE CASCADE,
+  FOREIGN KEY (user_id) REFERENCES config(row_id) ON DELETE CASCADE
+);
+
+
+COMMENT ON TABLE moderation_allocation IS 'The relationship between users and proposals_reviews.';
+COMMENT ON COLUMN moderation_allocation.row_id IS 'Synthetic ID of this relationship.';
+COMMENT ON COLUMN moderation_allocation.review_id IS 'The review the relationship is related to.';
+COMMENT ON COLUMN moderation_allocation.user_id IS 'The user the relationship is related to.';
+
+
+-- Moderation - Defines the moderation submitted by users for each proposal_review.
+
+CREATE TABLE moderation (
+  row_id SERIAL PRIMARY KEY,
+  review_id INTEGER NOT NULL,
+  user_id INTEGER NOT NULL,
+  classification INTEGER NOT NULL,
+  rationale VARCHAR,
+  UNIQUE (review_id, user_id),
+
+  FOREIGN KEY (review_id) REFERENCES proposal_review(row_id) ON DELETE CASCADE,
+  FOREIGN KEY (user_id) REFERENCES config(row_id) ON DELETE CASCADE
+);
+
+
+COMMENT ON TABLE moderation IS 'An individual moderation for a proposal review.';
+COMMENT ON COLUMN moderation.row_id IS 'Synthetic ID of this moderation.';
+COMMENT ON COLUMN moderation.review_id IS 'The review the moderation is related to.';
+COMMENT ON COLUMN moderation.user_id IS 'The user the moderation is submitted from.';
+COMMENT ON COLUMN moderation.classification IS 'The value used to describe the moderation (e.g. 0: excluded, 1: included).';
+COMMENT ON COLUMN moderation.rationale IS 'The rationale for the given classification.';

src/event-db/migrations/V6__proposal_tables.sql renamed to src/event-db/migrations/V4__proposal_tables.sql

@@ -11,13 +11,12 @@ deps:
     RUN apt-get update && \
         apt-get install -y --no-install-recommends curl
 
-    RUN curl -sSL https://install.python-poetry.org | python3 - --version 2.0.1
+    RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.0
 
     COPY pyproject.toml .
     COPY poetry.lock .
 
     RUN poetry install --only main --no-root
-    RUN poetry self add poetry-plugin-export
 
 src:
     FROM +deps

src/event-db/migrations/V5__user.sql

@@ -15,8 +15,7 @@ build:
         apt-get install -y --no-install-recommends curl build-essential libxml2-dev libxslt-dev zlib1g-dev python3-lxml
 
     # Install Poetry
-    RUN curl -sSL https://install.python-poetry.org | python3 - --version 2.0.1
-
+    RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.0
     # Set path to poetry
     ENV PATH=/root/.local/bin:$PATH
 
@@ -29,7 +28,6 @@ build:
     RUN poetry env use python
     RUN poetry config installer.max-workers 10
     RUN poetry install --no-cache --no-root
-    RUN poetry self add poetry-plugin-export
 
     # Build the distribution wheels and save them as artifacts
     RUN poetry export --without-hashes -f requirements.txt --output requirements.txt