add enrolledUsers in Offer (#628)

ita-social-projects · Nov 15, 2023 · 856adf3 · 856adf3
1 parent 8407875
commit 856adf3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 26 deletions.
diff --git a/docs/offer/offer-schema.yaml b/docs/offer/offer-schema.yaml
@@ -40,6 +40,9 @@ definitions:
         author:
           type: string
           ref: '#components/user'
+        enrolledUsers:
+          type: array
+          ref: '#components/user'
         subject:
           type: string
           ref: '#components/subject'
@@ -104,6 +107,9 @@ definitions:
             - Arabic
       authorRole:
         type: string
+      enrolledUsers:
+        type: array
+        ref: '#components/user'
       subject:
         type: string
         ref: '#components/subject'
@@ -164,6 +170,9 @@ definitions:
       author:
         type: string
         ref: '#components/user'
+      enrolledUsers:
+        type: array
+        ref: '#components/user'
       subject:
         type: string
         ref: '#components/subject'

diff --git a/docs/offer/offer.yaml b/docs/offer/offer.yaml
@@ -87,6 +87,7 @@ paths:
                     title: this is a new title for test purposes
                     description: this is a new description for test purposes
                     languages: [English]
+                    enrolledUsers: [6512e1ca5fd987b6ce926c2e]
                     authorRole: tutor
                     authorFirstName: Amanda
                     authorLastName: Smith
@@ -96,29 +97,22 @@ paths:
                       totalReviews:
                         student: 0
                         tutor: 0
-                      FAQ: {
-                        question: tutor question,
-                        _id: 63525e23bf163f5ea609ff2b,
-                        answer: tutor answer
-                      }
+                      FAQ: { question: tutor question, _id: 63525e23bf163f5ea609ff2b, answer: tutor answer }
                       professionalSummary: My professional summary
                       photo: link-to-photo.png
                     subject:
                       _id: 63da8767c9ad4c9a0b0eacd3
                       name: english
                     category: 63525e23bf163f5ea609ff2b
                     chatId: '64be59667f4136e211435a55'
-                    FAQ: {
-                      question: offer question,
-                      _id: 63525e23bf163f5ea609ff2b,
-                      answer: offer answer
-                    }
+                    FAQ: { question: offer question, _id: 63525e23bf163f5ea609ff2b, answer: offer answer }
                   - _id: 63ebc6fbd2f34037d0aba791
                     price: 300
                     proficiencyLevel: [Intermediate, Advanced]
                     title: this is a new title for test purposes
                     description: Lorem ipsum dolor sit amet consectetur
                     languages: [English, Ukrainian]
+                    enrolledUsers: [6512e1ca5fd987b6ce926c2e]
                     authorRole: tutor
                     authorFirstName: John
                     authorLastName: Smith
@@ -200,11 +194,7 @@ paths:
                 subject: 63da8767c9ad4c9a0b0eacd3
                 category: 63525e23bf163f5ea609ff2b
                 status: pending
-                FAQ: {
-                  question: tutor question,
-                  _id: 63525e23bf163f5ea609ff2b,
-                  answer: tutor answer
-                }
+                FAQ: { question: tutor question, _id: 63525e23bf163f5ea609ff2b, answer: tutor answer }
                 _id: 63ec1cd51e9d781cdb6f4b14
                 createdAt: 2023-02-14T23:44:21.334Z
                 updatedAt: 2023-02-14T23:44:21.334Z
@@ -258,6 +248,7 @@ paths:
                 title: this is a new title for test purposes
                 description: Lorem ipsum dolor sit amet consectetur
                 languages: [English, Ukrainian]
+                enrolledUsers: [6512e1ca5fd987b6ce926c2e]
                 authorRole: tutor
                 authorFirstName: John
                 authorLastName: Smith
@@ -267,23 +258,15 @@ paths:
                   totalReviews:
                     student: 0
                     tutor: 0
-                  FAQ: {
-                    question: tutor question,
-                    _id: 63525e23bf163f5ea609ff2b,
-                    answer: tutor answer
-                  }
+                  FAQ: { question: tutor question, _id: 63525e23bf163f5ea609ff2b, answer: tutor answer }
                   professionalSummary: My professional summary
                   photo: link-to-photo.png
                 subject:
                   _id: 63da8767c9ad4c9a0b0eacd3
                   name: piano
                 category: 63525e23bf163f5ea609ff2b
                 chatId: '64be59667f4136e211435a55'
-                FAQ: {
-                  question: tutor question,
-                  _id: 63525e23bf163f5ea609ff2b,
-                  answer: tutor answer
-                }
+                FAQ: { question: tutor question, _id: 63525e23bf163f5ea609ff2b, answer: tutor answer }
                 createdAt: 2023-02-14T23:44:21.334Z
                 updatedAt: 2023-02-14T23:44:21.334Z
         400:
@@ -364,6 +347,7 @@ paths:
               title: this is a new title for test purposes
               description: this is a test text 123
               languages: [Ukrainian, Polish]
+              enrolledUsers: [6512e1ca5fd987b6ce926c2e]
               subjectId: 63da8767c9ad4c9a0b0eacd3
               categoryId: 63525e23bf163f5ea609ff2b
       responses:

diff --git a/models/offer.js b/models/offer.js
@@ -62,6 +62,11 @@ const offerSchema = new Schema(
       ref: USER,
       required: true
     },
+    enrolledUsers: {
+      type: [Schema.Types.ObjectId],
+      ref: USER,
+      required: false
+    },
     subject: {
       type: Schema.Types.ObjectId,
       ref: SUBJECT,

diff --git a/services/offer.js b/services/offer.js
@@ -73,7 +73,8 @@ const offerService = {
   },
 
   createOffer: async (author, authorRole, data) => {
-    const { price, proficiencyLevel, title, description, languages, subject, category, status, FAQ } = data
+    const { price, proficiencyLevel, title, description, languages, enrolledUsers, subject, category, status, FAQ } =
+      data
 
     return await Offer.create({
       author,
@@ -83,6 +84,7 @@ const offerService = {
       title,
       description,
       languages,
+      enrolledUsers,
       subject,
       category,
       status,

diff --git a/test/integration/controllers/offer.spec.js b/test/integration/controllers/offer.spec.js
@@ -18,6 +18,7 @@ let testOffer = {
   FAQ: [{ question: 'question1', answer: 'answer1' }],
   description: 'TEST 123ASD',
   languages: ['Ukrainian'],
+  enrolledUsers: ['6512e1ca5fd987b6ce926c2e', '652ba66bf6770c3a2d5d8549'],
   subject: '',
   category: {
     _id: '',
@@ -87,6 +88,7 @@ describe('Offer controller', () => {
           subject,
           category,
           status: 'active',
+          enrolledUsers: expect.any(Array),
           createdAt: expect.any(String),
           updatedAt: expect.any(String)
         })