Improve Mercado Público search integration and tender search UX

backend/app/routers/tenders.py

@@ -1,12 +1,21 @@
+from datetime import datetime
 from typing import List, Optional
 from fastapi import APIRouter, Query, Depends
 from sqlalchemy.orm import Session
-from sqlalchemy import or_, desc
+from sqlalchemy import or_
 
 from app.schemas.tender import Tender
 from app.database import get_db
 from app.models.tender import TenderModel
 from app.services.sync import sync_tenders_to_db, clean_expired_tenders
+from app.services.mercado_publico import (
+    fetch_tenders,
+    get_tender_by_code,
+    get_tenders_by_provider,
+    get_tenders_by_org,
+    get_tenders_by_status_and_date,
+    get_tenders_by_date,
+)
 
 router = APIRouter()
 
@@ -15,10 +24,35 @@ async def search_tender_opportunities(
     keyword: Optional[str] = None,
     buyer: Optional[str] = None,
     region: Optional[str] = None,
+    provider_code: Optional[str] = Query(None, alias="provider_code"),
+    org_code: Optional[str] = Query(None, alias="org_code"),
+    status: Optional[str] = None,
+    code: Optional[str] = None,
+    date: Optional[str] = None,
     skip: int = 0,
     limit: int = 50,
     db: Session = Depends(get_db)
 ):
+    # If a Mercado Público-specific query is requested, fetch live from the external API.
+    if code:
+        tender = await get_tender_by_code(code)
+        return [tender] if tender else []
+
+    if provider_code:
+        return await get_tenders_by_provider(provider_code, date)
+
+    if org_code:
+        return await get_tenders_by_org(org_code, date)
+
+    if status:
+        return await get_tenders_by_status_and_date(status, date)
+
+    if date and not (buyer or region or keyword):
+        return await get_tenders_by_date(date)
+
+    if keyword and not (buyer or region):
+        return await fetch_tenders(keyword=keyword, date=date)
+
     # 1. Búsqueda en DB con paginación
     query = db.query(TenderModel)
     
@@ -44,7 +78,7 @@ async def search_tender_opportunities(
     # Ordenar por fecha de cierre (más próximas primero)
     results = query.order_by(TenderModel.closing_date.asc()).offset(skip).limit(limit).all()
     
-    # 2. Si la DB está vacía y no hay filtros, sugerir sincronización (no hace nada automático)
+    # 2. Si la DB está vacía y se busca por palabra clave, hacer un intento de sincronización.
     if not results and keyword and len(keyword) > 3:
         await sync_tenders_to_db(db, keyword=keyword)
         results = query.offset(skip).limit(limit).all()

backend/app/services/mercado_publico.py

@@ -75,6 +75,19 @@ TIME_UNITS = {
     "5": "Años"
 }
 
+def normalize_mp_date(date_str: Optional[str]) -> Optional[str]:
+    if not date_str:
+        return None
+    if "-" in date_str:
+        parts = date_str.split("-")
+        if len(parts) == 3 and all(part.isdigit() for part in parts):
+            # Convert ISO date YYYY-MM-DD into ddmmaaaa
+            return f"{parts[2].zfill(2)}{parts[1].zfill(2)}{parts[0]}"
+    if len(date_str) == 8 and date_str.isdigit():
+        return date_str
+    return date_str
+
+
 def map_raw_to_tender(item: Dict[str, Any]) -> Tender:
     """Maps raw API item to Tender schema."""
     items_list = []
@@ -163,26 +176,29 @@ async def get_active_tenders() -> List[Tender]:
 
 async def get_tenders_by_date(date: str) -> List[Tender]:
     """Fetches all tenders for a specific date (format ddmmaaaa)."""
-    return await _fetch({"fecha": date})
+    normalized = normalize_mp_date(date)
+    return await _fetch({"fecha": normalized})
 
 async def get_tenders_by_status_and_date(status: str, date: Optional[str] = None) -> List[Tender]:
     params = {"estado": status}
     if date:
-        params["fecha"] = date
+        params["fecha"] = normalize_mp_date(date)
     return await _fetch(params)
 
 async def get_tender_by_code(code: str) -> Optional[Tender]:
     results = await _fetch({"codigo": code})
     return results[0] if results else None
 
-async def get_tenders_by_provider(provider_code: str, date: str) -> List[Tender]:
-    return await _fetch({"CodigoProveedor": provider_code, "fecha": date})
+async def get_tenders_by_provider(provider_code: str, date: Optional[str] = None) -> List[Tender]:
+    normalized_date = normalize_mp_date(date if date else datetime.now().strftime("%Y-%m-%d"))
+    return await _fetch({"CodigoProveedor": provider_code, "fecha": normalized_date})
 
-async def get_tenders_by_org(org_code: str, date: str) -> List[Tender]:
-    return await _fetch({"CodigoOrganismo": org_code, "fecha": date})
+async def get_tenders_by_org(org_code: str, date: Optional[str] = None) -> List[Tender]:
+    normalized_date = normalize_mp_date(date if date else datetime.now().strftime("%Y-%m-%d"))
+    return await _fetch({"CodigoOrganismo": org_code, "fecha": normalized_date})
 
 async def fetch_tenders(keyword: Optional[str] = None, date: Optional[str] = None) -> List[Tender]:
-    search_date = date if date else datetime.now().strftime("%d%m%Y")
+    search_date = normalize_mp_date(date if date else datetime.now().strftime("%Y-%m-%d"))
     
     if not date:
         tenders = await get_active_tenders()

frontend/components/TenderSearch.tsx

@@ -7,7 +7,7 @@ import { Language, translations } from "../lib/translations";
 
 type Props = {
   tenders: Tender[];
-  onSearch: (params: { keyword?: string; buyer?: string; provider_code?: string; date?: string; skip?: number; limit?: number; isAgile?: boolean }) => void;
+  onSearch: (params: { keyword?: string; buyer?: string; provider_code?: string; org_code?: string; status?: string; code?: string; date?: string; skip?: number; limit?: number; isAgile?: boolean }) => void;
   onAnalyze: (tender: Tender) => void;
   forceShowFollowed?: boolean;
   initialKeyword?: string;
@@ -18,6 +18,9 @@ export default function TenderSearch({ tenders, onSearch, onAnalyze, forceShowFo
   const t = translations[lang];
   const [keyword, setKeyword] = useState(initialKeyword);
   const [buyerCode, setBuyerCode] = useState("");
+  const [providerCode, setProviderCode] = useState("");
+  const [orgCode, setOrgCode] = useState("");
+  const [status, setStatus] = useState("");
   const [date, setDate] = useState("");
   const [selectedTenderForModal, setSelectedTenderForModal] = useState<Tender | null>(null);
   const [selectedCodes, setSelectedCodes] = useState<string[]>([]);
@@ -38,6 +41,14 @@ export default function TenderSearch({ tenders, onSearch, onAnalyze, forceShowFo
   const [isAgileMode, setIsAgileMode] = useState(false);
   const itemsPerPage = 50;
 
+  const isTenderCode = /^[0-9]+-[0-9]+-[A-Z0-9]+$/i.test(keyword);
+  const isLiveSearch = Boolean(isTenderCode || providerCode || orgCode || status || date);
+  const searchButtonLabel = isLoading
+    ? "Searching..."
+    : isLiveSearch
+      ? "Live MP Search"
+      : "Fetch Active Tenders";
+
   useEffect(() => {
     if (forceShowFollowed) setShowOnlyFollowed(true);
   }, [forceShowFollowed]);
@@ -96,7 +107,10 @@ export default function TenderSearch({ tenders, onSearch, onAnalyze, forceShowFo
       
       await onSearch({ 
         keyword: isCode ? undefined : keyword,
-        provider_code: isCode ? keyword : undefined,
+        code: isCode ? keyword : undefined,
+        provider_code: providerCode || undefined,
+        org_code: orgCode || undefined,
+        status: status || undefined,
         buyer: buyerCode, 
         date,
         skip: 0, 
@@ -161,53 +175,117 @@ export default function TenderSearch({ tenders, onSearch, onAnalyze, forceShowFo
             </div>
             
             {!forceShowFollowed && (
-              <form onSubmit={handleSearch} className="relative z-10 grid grid-cols-1 md:grid-cols-4 gap-6 animate-in slide-in-from-top-4 duration-500">
-
-                <div className="space-y-2">
-                  <label className="text-[10px] uppercase tracking-wider text-slate-500 font-bold px-1">Keyword</label>
-                  <input
-                    type="text"
-                    name="keyword"
-                    autoComplete="off"
-                    placeholder="e.g. Software, Cloud..."
-                    className="w-full bg-white/5 border border-white/10 rounded-xl px-4 py-3 text-white placeholder:text-slate-600 focus:outline-none focus:ring-2 focus:ring-purple-500/40 transition-all"
-                    value={keyword}
-                    onChange={(e) => setKeyword(e.target.value)}
-                  />
-                </div>
-                <div className="space-y-2">
-                  <label className="text-[10px] uppercase tracking-wider text-slate-500 font-bold px-1">Buyer Code</label>
-                  <input
-                    type="text"
-                    name="buyerCode"
-                    autoComplete="off"
-                    placeholder="e.g. 6945"
-                    className="w-full bg-white/5 border border-white/10 rounded-xl px-4 py-3 text-white placeholder:text-slate-600 focus:outline-none focus:ring-2 focus:ring-purple-500/40 transition-all"
-                    value={buyerCode}
-                    onChange={(e) => setBuyerCode(e.target.value)}
-                  />
+              <form onSubmit={handleSearch} className="relative z-10 space-y-4 animate-in slide-in-from-top-4 duration-500">
+                <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-6">
+                  <div className="space-y-2">
+                    <label className="text-[10px] uppercase tracking-wider text-slate-500 font-bold px-1">Keyword</label>
+                    <input
+                      type="text"
+                      name="keyword"
+                      autoComplete="off"
+                      placeholder="e.g. Software, Cloud..."
+                      className="w-full bg-white/5 border border-white/10 rounded-xl px-4 py-3 text-white placeholder:text-slate-600 focus:outline-none focus:ring-2 focus:ring-purple-500/40 transition-all"
+                      value={keyword}
+                      onChange={(e) => setKeyword(e.target.value)}
+                    />
+                  </div>
+                  <div className="space-y-2">
+                    <label className="text-[10px] uppercase tracking-wider text-slate-500 font-bold px-1">Keyword / Tender Code</label>
+                    <input
+                      type="text"
+                      name="code"
+                      autoComplete="off"
+                      placeholder="e.g. Software or 1509-5-L114"
+                      className="w-full bg-white/5 border border-white/10 rounded-xl px-4 py-3 text-white placeholder:text-slate-600 focus:outline-none focus:ring-2 focus:ring-purple-500/40 transition-all"
+                      value={keyword}
+                      onChange={(e) => setKeyword(e.target.value)}
+                    />
+                  </div>
+                  <div className="space-y-2">
+                    <label className="text-[10px] uppercase tracking-wider text-slate-500 font-bold px-1">Buyer name</label>
+                    <input
+                      type="text"
+                      name="buyerCode"
+                      autoComplete="off"
+                      placeholder="e.g. Servicio de Salud"
+                      className="w-full bg-white/5 border border-white/10 rounded-xl px-4 py-3 text-white placeholder:text-slate-600 focus:outline-none focus:ring-2 focus:ring-purple-500/40 transition-all"
+                      value={buyerCode}
+                      onChange={(e) => setBuyerCode(e.target.value)}
+                    />
+                  </div>
+                  <div className="space-y-2">
+                    <label className="text-[10px] uppercase tracking-wider text-slate-500 font-bold px-1">Provider Code</label>
+                    <input
+                      type="text"
+                      name="providerCode"
+                      autoComplete="off"
+                      placeholder="e.g. 17793"
+                      className="w-full bg-white/5 border border-white/10 rounded-xl px-4 py-3 text-white placeholder:text-slate-600 focus:outline-none focus:ring-2 focus:ring-purple-500/40 transition-all"
+                      value={providerCode}
+                      onChange={(e) => setProviderCode(e.target.value)}
+                    />
+                  </div>
+                  <div className="space-y-2">
+                    <label className="text-[10px] uppercase tracking-wider text-slate-500 font-bold px-1">Org Code</label>
+                    <input
+                      type="text"
+                      name="orgCode"
+                      autoComplete="off"
+                      placeholder="e.g. 6945"
+                      className="w-full bg-white/5 border border-white/10 rounded-xl px-4 py-3 text-white placeholder:text-slate-600 focus:outline-none focus:ring-2 focus:ring-purple-500/40 transition-all"
+                      value={orgCode}
+                      onChange={(e) => setOrgCode(e.target.value)}
+                    />
+                  </div>
+                  <div className="space-y-2">
+                    <label className="text-[10px] uppercase tracking-wider text-slate-500 font-bold px-1">Status</label>
+                    <select
+                      className="w-full bg-white/5 border border-white/10 rounded-xl px-4 py-3 text-white focus:outline-none focus:ring-2 focus:ring-purple-500/40 transition-all"
+                      value={status}
+                      onChange={(e) => setStatus(e.target.value)}
+                    >
+                      <option value="">Any state</option>
+                      <option value="activas">activas</option>
+                      <option value="publicada">publicada</option>
+                      <option value="cerrada">cerrada</option>
+                      <option value="desierta">desierta</option>
+                      <option value="adjudicada">adjudicada</option>
+                      <option value="revocada">revocada</option>
+                      <option value="suspendida">suspendida</option>
+                    </select>
+                  </div>
+                  <div className="space-y-2">
+                    <label className="text-[10px] uppercase tracking-wider text-slate-500 font-bold px-1">Date</label>
+                    <input
+                      type="date"
+                      className="w-full bg-white/5 border border-white/10 rounded-xl px-4 py-3 text-white focus:outline-none focus:ring-2 focus:ring-purple-500/40 transition-all [color-scheme:dark]"
+                      value={date}
+                      onChange={(e) => setDate(e.target.value)}
+                    />
+                  </div>
                 </div>
-                <div className="space-y-2">
-                  <label className="text-[10px] uppercase tracking-wider text-slate-500 font-bold px-1">Date Limit</label>
-                  <input
-                    type="date"
-                    className="w-full bg-white/5 border border-white/10 rounded-xl px-4 py-3 text-white focus:outline-none focus:ring-2 focus:ring-purple-500/40 transition-all [color-scheme:dark]"
-                    value={date}
-                    onChange={(e) => setDate(e.target.value)}
-                  />
+                <div className="rounded-3xl bg-slate-900/70 border border-white/10 p-4 text-slate-400 text-xs leading-5">
+                  <span className="font-bold text-slate-200">Tip:</span> Deja todos los campos vacíos para mostrar las licitaciones activas del día. Usa <span className="font-semibold text-white">Tender Code</span> para una búsqueda exacta o los filtros <span className="font-semibold text-white">Provider Code</span>, <span className="font-semibold text-white">Org Code</span>, <span className="font-semibold text-white">Status</span> y <span className="font-semibold text-white">Date</span> para consultas directas en Mercado Público.
                 </div>
-                <div className="flex items-end gap-3">
-                  <button
-                    type="submit"
-                    disabled={isLoading}
-                    className="flex-1 premium-gradient hover:opacity-90 text-white font-bold py-3.5 rounded-xl transition-all shadow-lg shadow-purple-500/20 active:scale-[0.98] disabled:opacity-50"
-                  >
-                    {isLoading ? "Searching..." : "Fetch Opportunities"}
-                  </button>
+                <div className="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
+                  <div className="flex flex-col gap-2">
+                    <button
+                      type="submit"
+                      disabled={isLoading}
+                      className="w-full sm:w-auto premium-gradient hover:opacity-90 text-white font-bold py-3.5 rounded-xl transition-all shadow-lg shadow-purple-500/20 active:scale-[0.98] disabled:opacity-50"
+                    >
+                      {searchButtonLabel}
+                    </button>
+                    {isLiveSearch && (
+                      <span className="inline-flex items-center justify-center rounded-full bg-emerald-500/10 text-emerald-300 text-[10px] uppercase tracking-[0.25em] px-3 py-2 border border-emerald-500/20">
+                        Live Mercado Público search
+                      </span>
+                    )}
+                  </div>
                   <button
                     type="button"
                     onClick={() => setIsAgileMode(!isAgileMode)}
-                    className={`px-4 py-3.5 rounded-xl border font-bold text-[10px] uppercase tracking-widest transition-all ${
+                    className={`w-full sm:w-auto px-4 py-3.5 rounded-xl border font-bold text-[10px] uppercase tracking-widest transition-all ${
                       isAgileMode 
                         ? "bg-cyan/20 border-cyan/40 text-cyan animate-pulse" 
                         : "bg-white/5 border-white/10 text-slate-500 hover:border-white/20"

frontend/lib/api.ts

@@ -24,6 +24,9 @@ export async function searchTenders(params: {
   keyword?: string; 
   buyer?: string; 
   provider_code?: string; 
+  org_code?: string;
+  status?: string;
+  code?: string;
   date?: string;
   skip?: number;
   limit?: number;
@@ -32,6 +35,9 @@ export async function searchTenders(params: {
   if (params.keyword) query.append("keyword", params.keyword);
   if (params.buyer) query.append("buyer", params.buyer);
   if (params.provider_code) query.append("provider_code", params.provider_code);
+  if (params.org_code) query.append("org_code", params.org_code);
+  if (params.status) query.append("status", params.status);
+  if (params.code) query.append("code", params.code);
   if (params.date) query.append("date", params.date);
   if (params.skip !== undefined) query.append("skip", params.skip.toString());
   if (params.limit !== undefined) query.append("limit", params.limit.toString());