Master #1

Open
cnbugs wants to merge 27 commits from master into 0.0.1
Showing only changes of commit 5369d8d6e5 - Show all commits
+2 -1
View File
@@ -1,5 +1,6 @@
from typing import List, Dict, Any, Optional from typing import List, Dict, Any, Optional
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from sqlalchemy import func
from datetime import datetime, timedelta from datetime import datetime, timedelta
import logging import logging
import json import json
@@ -80,7 +81,7 @@ class AlertService:
subquery = db.query( subquery = db.query(
ARPEntry.ip_address ARPEntry.ip_address
).group_by(ARPEntry.ip_address).having( ).group_by(ARPEntry.ip_address).having(
db.func.count(db.func.distinct(ARPEntry.mac_address)) > 1 func.count(func.distinct(ARPEntry.mac_address)) > 1
).subquery() ).subquery()
conflict_entries = db.query(ARPEntry).filter( conflict_entries = db.query(ARPEntry).filter(