Add access to user.announcements_email

Closes #27.
falling-fruit · Jul 10, 2023 · 9ed7467 · 9ed7467
1 parent 481524b
commit 9ed7467
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 5 deletions.
diff --git a/db/repos/users.js b/db/repos/users.js
@@ -12,6 +12,7 @@ class Users {
       name: null,
       bio: null,
       range: null,
+      announcements_email: true,
       ...req.body
     }
     // Store encrypted password

diff --git a/db/sql/users/add.sql b/db/sql/users/add.sql
@@ -3,20 +3,24 @@ INSERT INTO users (
   encrypted_password,
   name,
   bio,
-  range
+  range,
+  announcements_email
 )
 VALUES (
   ${email},
   ${password},
   ${name},
   ${bio},
-  ST_GeomFromGeoJson(${range:json})
+  ST_GeomFromGeoJson(${range:json}),
+  ${announcements_email}
 )
 RETURNING
   id,
   email,
   name,
   bio,
+  ST_AsGeoJson(range) as range,
+  announcements_email,
   roles,
   created_at,
   updated_at,

diff --git a/db/sql/users/edit.sql b/db/sql/users/edit.sql
@@ -3,11 +3,13 @@ SET (
   name,
   bio,
   range,
+  announcements_email,
   updated_at
 ) = (
   ${name},
   ${bio},
   ST_GeomFromGeoJson(${range:json}),
+  ${announcements_email},
   NOW()
 )
 WHERE id = ${id}
@@ -16,8 +18,9 @@ RETURNING
   email,
   name,
   bio,
-  roles,
   ST_AsGeoJson(range) as range,
+  announcements_email,
+  roles,
   created_at,
   updated_at,
   confirmed_at,

diff --git a/db/sql/users/edit_password.sql b/db/sql/users/edit_password.sql
@@ -4,12 +4,14 @@ SET (
   bio,
   encrypted_password,
   range,
+  announcements_email,
   updated_at
 ) = (
   ${name},
   ${bio},
   ${password},
   ST_GeomFromGeoJson(${range:json}),
+  ${announcements_email},
   NOW()
 )
 WHERE id = ${id}
@@ -18,8 +20,9 @@ RETURNING
   email,
   name,
   bio,
-  roles,
   ST_AsGeoJson(range) as range,
+  announcements_email,
+  roles,
   created_at,
   updated_at,
   confirmed_at,

diff --git a/db/sql/users/show.sql b/db/sql/users/show.sql
@@ -3,8 +3,9 @@ SELECT
   email,
   name,
   bio,
-  roles,
   ST_AsGeoJson(range) as range,
+  announcements_email,
+  roles,
   created_at,
   updated_at,
   confirmed_at

diff --git a/docs/components/schemas.yml b/docs/components/schemas.yml
@@ -554,6 +554,7 @@ EditUser:
     - name
     - bio
     - range
+    - announcements_email
   properties:
     email:
       $ref: properties.yml#/email
@@ -567,6 +568,11 @@ EditUser:
         - type: object
           description: Foraging range.
           nullable: true
+    announcements_email:
+      description: Whether user woud like to receive announcements by email.
+      type: boolean
+      example: true
+      default: true
 PublicUser:
   title: User (public)
   allOf:

diff --git a/docs/openapi.yml b/docs/openapi.yml
@@ -1687,6 +1687,7 @@ components:
         - name
         - bio
         - range
+        - announcements_email
       properties:
         email:
           description: Email.
@@ -1754,6 +1755,11 @@ components:
             - type: object
               description: Foraging range.
               nullable: true
+        announcements_email:
+          description: Whether user woud like to receive announcements by email.
+          type: boolean
+          example: true
+          default: true
     PublicUser:
       title: User (public)
       allOf: