5103022014/Skripsi_Valentino_5103022014
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 16 mei urutan dan tampilan user admin

Browse Source
This commit is contained in:
[Valentino Heman Budiarto]
2026-05-16 15:30:23 +07:00
parent 4970220a24
commit 8e7f5f539b
9 changed files with 225 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/0
View File
backend/controllers/bookingcontroller.go
+63 -50
View File
@@ -51,13 +51,16 @@ func CreateBooking(c *gin.Context) {
return
}
// (Overlap Check)
// (Overlap Check)
var count int64
config.DB.Model(&models.Booking{}).Where("room_id = ? AND status != 'Cancelled' AND ((start_time < ? AND end_time > ?) OR (start_time < ? AND end_time > ?) OR (start_time >= ? AND end_time <= ?))",
input.RoomID, input.EndTime, input.StartTime, input.EndTime, input.StartTime, input.StartTime, input.EndTime).Count(&count)
// KITA UBAH STATUSNYA MENJADI: status IN ('Pending', 'Approved')
config.DB.Model(&models.Booking{}).Where(
"room_id = ? AND status IN ('Pending', 'Approved') AND ((start_time < ? AND end_time > ?) OR (start_time < ? AND end_time > ?) OR (start_time >= ? AND end_time <= ?))",
input.RoomID, input.EndTime, input.StartTime, input.EndTime, input.StartTime, input.StartTime, input.EndTime,
).Count(&count)
if count > 0 {
c.JSON(http.StatusConflict, gin.H{"error": "Ruangan sudah dibooking pada jam tersebut!"})
c.JSON(http.StatusConflict, gin.H{"error": "Ruangan sudah dibooking atau sedang dalam antrean persetujuan pada jam tersebut!"})
return
}
@@ -110,44 +113,56 @@ type UpdateStatusInput struct {
// UPDATE STATUS (ADMIN)
func UpdateBookingStatus(c *gin.Context) {
bookingID := c.Param("id")
var input UpdateStatusInput
bookingID := c.Param("id")
// 1. Validasi Input JSON
if err := c.ShouldBindJSON(&input); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Format data tidak valid"})
return
}
var input UpdateStatusInput
if err := c.ShouldBindJSON(&input); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Format data salah"})
return
}
var booking models.Booking
// 2. Gunakan "id = ?" jika primary key di DB adalah 'id'
// Jika di model kamu pakai 'RoomID', pastikan konsisten
if err := config.DB.Where("id = ?", bookingID).First(&booking).Error; err != nil {
c.JSON(http.StatusNotFound, gin.H{"error": "Data booking tidak ditemukan di database"})
return
}
var booking models.Booking
// KUNCI PERBAIKAN: Gunakan Where("booking_id = ?") agar tepat sasaran
if err := config.DB.Where("booking_id = ?", bookingID).First(&booking).Error; err != nil {
c.JSON(http.StatusNotFound, gin.H{"error": "Data booking tidak ditemukan di database"})
return
}
// 3. Update Status
booking.Status = input.Status
// Gunakan Switch Case (Clean Code) yang sudah kita bahas sebelumnya
switch input.Status {
case "Approved":
if booking.RedeemCode == "" {
booking.RedeemCode = helpers.GenerateRedeemCode()
}
case "Rejected", "Cancelled":
booking.RedeemCode = ""
}
// REVISI CLEAN CODE: Menggunakan Switch
switch input.Status {
case "Approved":
if booking.RedeemCode == "" {
booking.RedeemCode = helpers.GenerateRedeemCode()
}
case "Rejected", "Cancelled":
booking.RedeemCode = ""
}
if err := config.DB.Save(&booking).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Gagal menyimpan perubahan ke database"})
return
}
booking.Status = input.Status
c.JSON(http.StatusOK, gin.H{
"message": "Status berhasil diperbarui!",
"data": booking,
})
if err := config.DB.Save(&booking).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Gagal menyimpan ke database"})
return
}
c.JSON(http.StatusOK, gin.H{
"message": "Status booking berhasil diperbarui!",
"data": booking,
})
booking.Status = input.Status
// KITA BUKA KEDOK ERROR DARI POSTGRESQL:
if err := config.DB.Save(&booking).Error; err != nil {
fmt.Println("🔥 ERROR DARI DATABASE:", err.Error()) // Cetak teks merah di terminal
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) // Tembak ke pop-up web
return
}
c.JSON(http.StatusOK, gin.H{
"message": "Status booking berhasil diperbarui!",
"data": booking,
})
}
// INPUT UNTUK ESP3
@@ -184,19 +199,17 @@ func VerifyRedeemCode(c *gin.Context) {
// GET ALL BOOKINGS (Untuk Calendar View semua user)
func GetAllBookings(c *gin.Context) {
var bookings []models.Booking
var bookings []models.Booking
// Preload digunakan untuk mengambil data Relasi (Nama Ruangan & Nama Peminjam)
if err := config.DB.Preload("Room").Preload("User").Order("created_at desc").Find(&bookings).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
// Preload digunakan untuk mengambil data Relasi (Nama Ruangan & Nama Peminjam)
if err := config.DB.Preload("Room").Preload("User").Order("created_at desc").Find(&bookings).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
// Perhatikan: responsenya menggunakan "data: bookings" agar cocok dengan Frontend React-mu
c.JSON(http.StatusOK, gin.H{
"status": "success",
"data": bookings,
})
// Perhatikan: responsenya menggunakan "data: bookings" agar cocok dengan Frontend React-mu
c.JSON(http.StatusOK, gin.H{
"status": "success",
"data": bookings,
})
}
backend/controllers/roomcontroller.go
+8 -9
View File
@@ -56,26 +56,25 @@ func UpdateRoomStatus(c *gin.Context) {
}
var room models.Room
// KUNCI PERBAIKANNYA: Cukup masukkan `roomID` langsung.
// GORM akan otomatis mencari berdasarkan Primary Key tanpa peduli nama kolomnya.
if err := config.DB.First(&room, roomID).Error; err != nil {
c.JSON(http.StatusNotFound, gin.H{"error": "Ruangan tidak ditemukan di tabel"})
// Karena model sudah di-tag dengan benar, pencarian ini pasti akan berhasil
if err := config.DB.Where("room_id = ?", roomID).First(&room).Error; err != nil {
c.JSON(http.StatusNotFound, gin.H{"error": "Ruangan tidak ditemukan"})
return
}
// Ubah status dan simpan
room.Status = input.Status
if err := config.DB.Save(&room).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Gagal menyimpan perubahan"})
return
}
c.JSON(http.StatusOK, gin.H{
"message": "Status ruangan berhasil diperbarui",
"data": room,
})
}
// UPDATE ROOM POWER (Menerima data Watt dari ESP32 / Tuya)
// UPDATE ROOM POWER (Menerima data Watt dari ESP32)
func UpdateRoomPower(c *gin.Context) {
var input EnergySensorInput
@@ -85,14 +84,14 @@ func UpdateRoomPower(c *gin.Context) {
}
var room models.Room
if err := config.DB.First(&room, "room_id = ?", input.RoomID).Error; err != nil {
// Tetap gunakan room_id agar GORM tidak bingung
if err := config.DB.Where("room_id = ?", input.RoomID).First(&room).Error; err != nil {
c.JSON(http.StatusNotFound, gin.H{"error": "Ruangan tidak ditemukan"})
return
}
// Pastikan kolom ini sesuai dengan nama di models.Room milikmu (misal: PowerConsumption)
room.PowerConsumption = input.Power
config.DB.Save(&room)
c.JSON(http.StatusOK, gin.H{"message": "Data daya ESP32 berhasil disimpan"})
}
}
backend/models/entity.go
+6 -6
View File
@@ -19,12 +19,12 @@ type User struct {
}
type Room struct {
RoomID uint `gorm:"primaryKey" json:"room_id"`
Name string `gorm:"not null" json:"name"`
Category string `gorm:"not null" json:"category"`
Capacity int `gorm:"not null" json:"capacity"`
Floor string `gorm:"not null" json:"floor"`
Status string `gorm:"type:room_status;default:'Available'" json:"status"`
RoomID uint `gorm:"primaryKey;column:room_id" json:"room_id"`
Name string `json:"name"`
Category string `json:"category"`
Floor string `json:"floor"`
Capacity int `json:"capacity"`
Status string `json:"status"`
PowerConsumption float64 `json:"power_consumption" gorm:"default:0"`
}