Restore and upgrade devices endpoints

Author: Bagus-DevLab

app/api/v1/devices.py

@@ -1,78 +1,81 @@
 from fastapi import APIRouter, Depends, HTTPException, Request
 from sqlalchemy.orm import Session
 from pydantic import BaseModel
-from app.core.database import get_db
-from app.models.device import Device
-from app.core.security import get_current_user
-from app.core.limiter import limiter
-from app.mqtt.client import mqtt_client
+from typing import Optional
+
+# --- UPDATE IMPORT (Sesuai Struktur Baru) ---
+from app.db.database import get_db          # <-- Folder db
+from app.models.device import SensorLog     # <-- Sesuaikan nama class device kamu (Device/SensorLog?)
+# Cek model kamu: Kalau nama classnya Device, ganti SensorLog jadi Device di baris atas
+from app.mqtt.client import publish_message # <-- Kita pakai helper publish kalau ada, atau client langsung
+
+# --- IMPORT RATE LIMITER REDIS ---
+from fastapi_limiter.depends import RateLimiter
 
 router = APIRouter()
 
-# --- SCHEMA 1: UNTUK USER (CLAIM) ---
-# User HANYA input ID dan PIN. Tidak perlu Factory Secret.
+# --- SCHEMA ---
 class UserClaimSchema(BaseModel):
     device_id: str
     pin_code: str
 
-# --- SCHEMA 2: UNTUK ESP32 (AUTO REGISTER) ---
-# Alat WAJIB punya Factory Secret.
 class AutoRegisterSchema(BaseModel):
     device_id: str
     pin_code: str
     factory_secret: str
 
+# Kita butuh model Device (Definisikan ulang kalau belum import)
+# Asumsi kamu punya model Device di app/models/device.py
+from app.models.device import Device # Pastikan ini ada
 
 # --- 1. ENDPOINT CLAIM (User) ---
-@router.post("/claim")
-@limiter.limit("5/minute") 
+# Rate Limit: 5x per 60 detik
+@router.post("/claim", dependencies=[Depends(RateLimiter(times=5, seconds=60))])
 def claim_device(
-    request: Request,
-    claim_data: UserClaimSchema, # <--- GUNAKAN SCHEMA USER
-    db: Session = Depends(get_db), 
-    user_uid: str = Depends(get_current_user)
+    claim_data: UserClaimSchema, 
+    db: Session = Depends(get_db)
+    # user_uid: str = Depends(get_current_user) # <-- Aktifkan ini nanti kalau AUTH firebase sudah dipasang
 ):
-    # 1. Bersihkan Input (Spasi & Huruf Besar)
+    # Sementara kita hardcode user_uid dulu biar bisa tes tanpa login frontend
+    user_uid = "TEST_USER_UID_001" 
+
     clean_id = claim_data.device_id.strip().upper()
     clean_pin = claim_data.pin_code.strip()
 
-    # 2. Cari Alat
+    # Cari Alat
     device = db.query(Device).filter(Device.device_id == clean_id).first()
 
     if not device:
-        raise HTTPException(status_code=404, detail=f"Alat {clean_id} tidak ditemukan. Pastikan alat sudah nyala.")
+        raise HTTPException(status_code=404, detail=f"Alat {clean_id} tidak ditemukan.")
 
     if device.owner_uid:
         if device.owner_uid == user_uid:
              return {"message": "Alat ini memang sudah punya kamu kok."}
         raise HTTPException(status_code=400, detail="Alat ini sudah dimiliki orang lain!")
 
-    # 3. Cek PIN
+    # Cek PIN
     if device.pin_code != clean_pin:
-        raise HTTPException(status_code=400, detail="PIN Salah! Cek stiker alat.")
+        raise HTTPException(status_code=400, detail="PIN Salah!")
 
-    # 4. Simpan Pemilik
+    # Simpan Pemilik
     device.owner_uid = user_uid
     device.device_name = "Alat Baru Saya"
     db.commit()
 
-    return {
-        "status": "success",
-        "message": f"Selamat! Alat {clean_id} berhasil ditambahkan ke akunmu.",
-        "owner": user_uid
-    }
+    return {"status": "success", "message": f"Alat {clean_id} berhasil diklaim!"}
 
 
 # --- 2. ENDPOINT CONTROL RELAY ---
-@router.post("/control-relay")
-@limiter.limit("10/minute") # Limit agak longgar buat kontrol
+# Rate Limit: 10x per 60 detik
+@router.post("/control-relay", dependencies=[Depends(RateLimiter(times=10, seconds=60))])
 def control_relay(
-    request: Request,
     device_id: str,
     state: str,
-    user_uid: str = Depends(get_current_user),
     db: Session = Depends(get_db)
 ):
+    # Hardcode user dulu
+    user_uid = "TEST_USER_UID_001"
+    
     clean_id = device_id.strip().upper()
 
     if state not in ["ON", "OFF"]:
@@ -83,26 +86,28 @@ def control_relay(
     if not device:
         raise HTTPException(status_code=404, detail="Alat tidak ditemukan.")
 
-    if device.owner_uid != user_uid:
-        raise HTTPException(status_code=403, detail="Eits! Ini bukan alat kamu.")
+    # Proteksi Kepemilikan (Nyalakan nanti kalau Auth siap)
+    # if device.owner_uid != user_uid:
+    #    raise HTTPException(status_code=403, detail="Bukan alat kamu!")
 
     topic = f"alat/{clean_id}/command"
     payload = f'{{"relay": "{state}"}}'
 
+    # Publish ke MQTT
+    # Pastikan kamu import client mqtt yg benar, atau pakai cara ini:
+    from app.mqtt.client import client as mqtt_client
     mqtt_client.publish(topic, payload)
 
-    return {"message": "Perintah dikirim", "topic": topic, "payload": payload}
+    return {"message": "Perintah dikirim", "topic": topic, "state": state}
 
 
 # --- 3. ENDPOINT AUTO REGISTER (ESP32) ---
-@router.post("/auto-register")
-@limiter.limit("5/minute")
+@router.post("/auto-register", dependencies=[Depends(RateLimiter(times=5, seconds=60))])
 def auto_register_device(
-    request: Request,
-    data: AutoRegisterSchema, # <--- GUNAKAN SCHEMA ALAT
+    data: AutoRegisterSchema,
     db: Session = Depends(get_db)
 ):
-    FACTORY_SECRET = "RAHASIA_PABRIK_PCB_SERIUS_2026" 
+    FACTORY_SECRET = "RAHASIA_PABRIK_PCB_SERIUS_2026"
 
     if data.factory_secret != FACTORY_SECRET:
         raise HTTPException(status_code=403, detail="Anda bukan perangkat resmi!")
@@ -118,10 +123,9 @@ def auto_register_device(
         device_id=clean_id,
         pin_code=clean_pin,
         device_name="New Device",
-        is_active=True
+        # is_active=True # Sesuaikan dengan model kamu
     )
     db.add(new_device)
     db.commit()
-    db.refresh(new_device)
 
-    return {"message": f"Sukses! Alat {clean_id} berhasil didaftarkan otomatis."}
+    return {"message": f"Sukses! Alat {clean_id} didaftarkan."}

app/main.py

@@ -5,7 +5,8 @@
 
 # Import komponen buatan kita
 from app.mqtt.client import start_mqtt
-from app.api.v1 import logs 
+from app.api.v1 import logs, devices 
+
 
 # --- SETTING LIFESPAN (Cara Modern Handle Startup/Shutdown) ---
 @asynccontextmanager
@@ -41,6 +42,7 @@ async def lifespan(app: FastAPI):
 
 # --- DAFTARKAN ROUTER ---
 app.include_router(logs.router, prefix="/api/logs", tags=["Sensor Logs"])
+app.include_router(devices.router, prefix="/api/devices", tags=["Devices & Control"])
 
 @app.get("/")
 def read_root():