Merge pull request #125 from GSG-G7/heroku-script

Heroku script
GSG-G7 · Oct 5, 2019 · e201e1f · e201e1f
2 parents f02cdba + d524934
commit e201e1f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/client/src/components/common/TeacherTable/index.js b/client/src/components/common/TeacherTable/index.js
@@ -38,7 +38,7 @@ export default class TeacherTable extends React.Component {
                   first_name: firstName,
                   last_name: lastName,
                   subject_name: subjectName,
-                  teacher_id: id,
+                  user_id: id,
                   subject_id: subjectId,
                   class: classId,
                 }) => (

diff --git a/server/database/config/build.sql b/server/database/config/build.sql
@@ -24,7 +24,6 @@ CREATE TABLE teacher(
     bio text,
     image_url text,
     mobile INTEGER,
-    email  VARCHAR(255),
     interest text,
     FOREIGN KEY (user_id) REFERENCES "user"(id)
 );

diff --git a/server/database/config/fakedata.sql b/server/database/config/fakedata.sql
@@ -19,12 +19,12 @@ VALUES
     (0127893456, 4);
 
 INSERT INTO teacher
-    (first_name,last_name,user_id, bio, image_url, mobile, email, interest)
+    (first_name,last_name,user_id, bio, image_url, mobile, interest)
 VALUES 
-    ('Ahmed','Ghareb',5, 'Hi Iam Ahmed Ghareb Iam a teacher in Gaza Primary School you can contact me', 'https://cdn4.iconfinder.com/data/icons/BRILLIANT/accounting/png/400/executive.png',0599542154,'ahm-214@gmail.com','Reading novels'),
-    ('Ali','Taha',6, 'Hi Iam Ali Taha Iam a teacher in Gaza Primary School you can contact me', 'https://cdn4.iconfinder.com/data/icons/BRILLIANT/accounting/png/400/executive.png',0599542154,'ahm-214@gmail.com','Reading novels'),
-    ('Arwa','Omar',7, 'Hi Iam Arwa Omar Iam a teacher in Gaza Primary School you can contact me', 'https://cdn4.iconfinder.com/data/icons/BRILLIANT/accounting/png/400/executive.png',0599542154,'ahm-214@gmail.com','Reading novels'),
-    ('Hala','salah',8, 'Hi Iam Hala Salah Iam a teacher in Gaza Primary School you can contact me', 'https://cdn4.iconfinder.com/data/icons/BRILLIANT/accounting/png/400/executive.png',0599542154,'ahm-214@gmail.com','Reading novels');
+    ('Ahmed','Ghareb',5, 'Hi Iam Ahmed Ghareb Iam a teacher in Gaza Primary School you can contact me', 'https://cdn4.iconfinder.com/data/icons/BRILLIANT/accounting/png/400/executive.png',0599542154,'Reading novels'),
+    ('Ali','Taha',6, 'Hi Iam Ali Taha Iam a teacher in Gaza Primary School you can contact me', 'https://cdn4.iconfinder.com/data/icons/BRILLIANT/accounting/png/400/executive.png',0599542154,'Reading novels'),
+    ('Arwa','Omar',7, 'Hi Iam Arwa Omar Iam a teacher in Gaza Primary School you can contact me', 'https://cdn4.iconfinder.com/data/icons/BRILLIANT/accounting/png/400/executive.png',0599542154,'Reading novels'),
+    ('Hala','salah',8, 'Hi Iam Hala Salah Iam a teacher in Gaza Primary School you can contact me', 'https://cdn4.iconfinder.com/data/icons/BRILLIANT/accounting/png/400/executive.png',0599542154,'Reading novels');
 
 INSERT INTO student   
     (student_name,class,parent_id) 

diff --git a/server/database/quieres/subjectPage.js b/server/database/quieres/subjectPage.js
@@ -4,6 +4,7 @@ const subject = (id) => {
   const sql = {
     text: ` select
     subject_teacher.teacher_id ,
+    teacher.user_id ,
     teacher.last_name ,
     teacher.first_name ,
     subject_teacher.subject_id ,

diff --git a/server/database/quieres/teacherProfile.js b/server/database/quieres/teacherProfile.js
@@ -1,7 +1,7 @@
 const connection = require('../config/connection');
 
 const getTeacherProfile = (id) => connection.query(
-  'select first_name, last_name, bio, image_url, mobile, teacher.email, interest from teacher inner join "user" on teacher.user_id="user".id where "user".id=$1 ',
+  'select first_name, last_name, bio, image_url, mobile, "user".email, interest from teacher inner join "user" on teacher.user_id="user".id where teacher.user_id=$1 ',
   [id],
 );
 

diff --git a/test/routes/subjecrPage.test.js b/test/routes/subjecrPage.test.js
@@ -9,6 +9,7 @@ test('Test subject Page', (t) => {
   const expected = {
     teacher_id: 1,
     last_name: 'Ghareb',
+    user_id: 5,
     first_name: 'Ahmed',
     subject_id: 1,
     subject_name: 'English',