diff --git a/src/tugas/tugas.dto.ts b/src/tugas/tugas.dto.ts
index c91d2592fc2c201ea085e671e4d6a0575e0d34e9..1bf372b3ce03a32ce1e16c50e39d08af6313c921 100644
--- a/src/tugas/tugas.dto.ts
+++ b/src/tugas/tugas.dto.ts
@@ -141,6 +141,9 @@ export class GetDaftarTugasByMahasiswaIdRespDto {
   @ApiProperty({ example: "Pengembangan Aplikasi" })
   namaMataKuliah: string;
 
+  @ApiProperty({ example: "550e8400-e29b-41d4-a716-446655440000" })
+  kelasId: string;
+
   @ApiProperty({
     example: "550e8400-e29b-41d4-a716-446655440000",
     description: "tugas id",
@@ -150,6 +153,12 @@ export class GetDaftarTugasByMahasiswaIdRespDto {
   @ApiProperty()
   judul: string;
 
+  @ApiProperty()
+  waktuMulai: Date;
+
+  @ApiProperty()
+  waktuSelesai: Date;
+
   @ApiPropertyOptional({ example: "550e8400-e29b-41d4-a716-446655440000" })
   submisiTugasId: string;
 
diff --git a/src/tugas/tugas.service.ts b/src/tugas/tugas.service.ts
index 84b144eaeabc9384ac96268f656a732a7b74977c..0e33561b73063e615f4229787ec4b9e8f92730d0 100644
--- a/src/tugas/tugas.service.ts
+++ b/src/tugas/tugas.service.ts
@@ -327,11 +327,13 @@ export class TugasService {
       )
       .select([
         "mk.id",
-        "kelas.id",
+        "kelas.id AS kelas_id",
         "mataKuliah.kode AS kode_mata_kuliah",
         "mataKuliah.nama AS nama_mata_kuliah",
         "tugas.id AS tugas_id",
         "tugas.judul AS tugas_judul",
+        "tugas.waktuMulai AS tugas_waktu_mulai",
+        "tugas.waktuSelesai AS tugas_waktu_selesai",
         "submisiTugas.id AS submisi_tugas_id",
         "submisiTugas.isSubmitted AS submisi_tugas_is_submitted",
       ])
@@ -364,8 +366,11 @@ export class TugasService {
       daftarTugas.map((tugas) => ({
         kodeMataKuliah: tugas.kode_mata_kuliah,
         namaMataKuliah: tugas.nama_mata_kuliah,
+        kelasId: tugas.kelas_id,
         id: tugas.tugas_id,
         judul: tugas.tugas_judul,
+        waktuMulai: tugas.tugas_waktu_mulai,
+        waktuSelesai: tugas.tugas_waktu_selesai,
         submisiTugasId: tugas.submisi_tugas_id || undefined,
         isSubmitted:
           tugas.submisi_tugas_is_submitted === null