Feat/52 api page and search

docs/open-api.yaml

@@ -115,6 +115,28 @@ paths:
               schema:
                 $ref: '#/components/schemas/ReservationResponse'
   /events:
+    get:
+      tags:
+      - event-controller
+      operationId: getEvents
+      parameters:
+      - name: title
+        in: query
+        required: false
+        schema:
+          type: string
+      - name: pageable
+        in: query
+        required: true
+        schema:
+          $ref: '#/components/schemas/Pageable'
+      responses:
+        "200":
+          description: OK
+          content:
+            '*/*':
+              schema:
+                $ref: '#/components/schemas/SuccessResponseDTO'
     post:
       tags:
       - event-controller
@@ -218,20 +240,6 @@ paths:
             '*/*':
               schema:
                 $ref: '#/components/schemas/EventResponse'
-  /events/:
-    get:
-      tags:
-      - event-controller
-      operationId: getEvents
-      responses:
-        "200":
-          description: OK
-          content:
-            '*/*':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/EventResponse'
   /bookmarks/{id}:
     get:
       tags:
@@ -416,3 +424,39 @@ components:
         event_id:
           type: integer
           format: int32
+    Pageable:
+      type: object
+      properties:
+        page:
+          minimum: 0
+          type: integer
+          format: int32
+        size:
+          minimum: 1
+          type: integer
+          format: int32
+        sort:
+          type: array
+          items:
+            type: string
+    SuccessResponseDTO:
+      required:
+      - data
+      - message
+      - path
+      - timestamp
+      - totalElements
+      type: object
+      properties:
+        timestamp:
+          type: string
+          format: date-time
+        message:
+          type: string
+        data:
+          type: object
+        path:
+          type: string
+        totalElements:
+          type: integer
+          format: int64

src/integrationTest/kotlin/com/group4/ticketingservice/Bookmark/BookmarkRepositoryTest.kt

@@ -9,9 +9,13 @@ import com.group4.ticketingservice.repository.EventRepository
 import com.group4.ticketingservice.repository.UserRepository
 import com.group4.ticketingservice.utils.Authority
 import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions.assertInstanceOf
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.PageRequest
+import org.springframework.data.domain.Pageable
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.transaction.annotation.Transactional
 import java.time.OffsetDateTime
@@ -37,11 +41,49 @@ class BookmarkRepositoryTest(
         maxAttendees = 10
     )
 
-    private val sampleBookmark = Bookmark(
-        user = sampleUser,
-        event = sampleEvent
+    val sampleEvents = mutableListOf(
+        Event(
+            title = "정섭이의 코딩쇼",
+            date = OffsetDateTime.now(),
+            reservationEndTime = OffsetDateTime.now(),
+            reservationStartTime = OffsetDateTime.now(),
+            maxAttendees = 10
+        ),
+        Event(
+            title = "민준이의 전국군가잘함",
+            date = OffsetDateTime.now(),
+            reservationEndTime = OffsetDateTime.now(),
+            reservationStartTime = OffsetDateTime.now(),
+            maxAttendees = 10
+        ),
+        Event(
+            title = "하영이의 신작도서 팬싸인회",
+            date = OffsetDateTime.now(),
+            reservationEndTime = OffsetDateTime.now(),
+            reservationStartTime = OffsetDateTime.now(),
+            maxAttendees = 10
+        ),
+        Event(
+            title = "준하의 스파르타 코딩 동아리 설명회",
+            date = OffsetDateTime.now(),
+            reservationEndTime = OffsetDateTime.now(),
+            reservationStartTime = OffsetDateTime.now(),
+            maxAttendees = 10
+        ),
+        Event(
+            title = "군대에서 코딩 직군으로 복무하기 설명회",
+            date = OffsetDateTime.now(),
+            reservationEndTime = OffsetDateTime.now(),
+            reservationStartTime = OffsetDateTime.now(),
+            maxAttendees = 10
+        )
     )
 
+    @AfterEach
+    fun removeBookmark() {
+        bookmarkRepository.deleteAll()
+    }
+
     @Test
     fun `bookmarkRepository_save should return savedBookmark`() {
         // given
@@ -67,7 +109,7 @@ class BookmarkRepositoryTest(
         val foundBookmark = bookmarkRepository.findByIdAndUserId(savedBookmark.id!!, savedUser.id!!)
 
         // then
-        assert(savedBookmark.id == foundBookmark.id)
+        assert(savedBookmark.id == foundBookmark?.id)
     }
 
     @Test
@@ -93,12 +135,35 @@ class BookmarkRepositoryTest(
         val savedUser = userRepository.save(sampleUser)
         val savedEvent = eventRepository.save(sampleEvent)
         bookmarkRepository.save(Bookmark(user = savedUser, event = savedEvent))
+        val pageable: Pageable = PageRequest.of(0, 10)
+
+        // when
+        val listofBookmarks = bookmarkRepository.findByUserId(savedUser.id!!, pageable)
+
+        // then
+        assertInstanceOf(Page::class.java, listofBookmarks)
+        assertInstanceOf(Bookmark::class.java, listofBookmarks.content[0])
+    }
+
+    @Test
+    fun `bookmarkRepository_findByUser should return page of bookmarks with pagination`() {
+        // given
+        val savedUser = userRepository.save(sampleUser)
+        bookmarkRepository.deleteAll()
+        sampleEvents.forEach {
+            val savedEvent = eventRepository.save(it)
+            bookmarkRepository.save(Bookmark(user = savedUser, event = savedEvent))
+        }
+        val pageSize = 2
+        val pageable: Pageable = PageRequest.of(0, pageSize)
 
         // when
-        val listofBookmarks = bookmarkRepository.findByUserId(savedUser.id!!)
+        val result = bookmarkRepository.findByUserId(savedUser.id!!, pageable)
 
         // then
-        assertInstanceOf(ArrayList::class.java, listofBookmarks)
-        assertInstanceOf(Bookmark::class.java, listofBookmarks[0])
+        assertThat(result.totalElements).isEqualTo(sampleEvents.size.toLong())
+        assertThat(result.pageable.pageSize).isEqualTo(pageSize)
+        assertThat(result.numberOfElements).isEqualTo(pageSize)
+        assertThat(result.content.size).isEqualTo(pageSize)
     }
 }