sarlink/sarlink-portal-api
7
0
Fork 0
mirror of https://github.com/i701/sarlink-portal-api.git synced 2025-06-14 20:26:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor imports in admin.py and update MAC address handling in views.py to improve code clarity and error handling
All checks were successful
Build and Push Docker Images / Build and Push Docker Images (push) Successful in 3m31s
Details

Browse Source
This commit is contained in:
i701 2025-06-08 15:23:18 +05:00
parent 1b58ebd4db
commit 7e2f6699b1
Signed by: i701
GPG Key ID: 54A0DA1E26D8E587
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/admin.py
View File

@ -1,8 +1,5 @@
from typing import Any
from django.contrib import admin from django.contrib import admin
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.forms.models import ModelForm
from django.http.request import HttpRequest
from api.models import User, Atoll, Island, TemporaryUser from api.models import User, Atoll, Island, TemporaryUser
from django.contrib.auth.models import Permission from django.contrib.auth.models import Permission

9
devices/views.py
View File

@ -1,4 +1,5 @@
from attr import dataclass from dataclasses import dataclass
from xmlrpc.client import Boolean
from rest_framework import generics, status from rest_framework import generics, status
from rest_framework.response import Response from rest_framework.response import Response
from django_filters.rest_framework import DjangoFilterBackend from django_filters.rest_framework import DjangoFilterBackend
@ -56,7 +57,7 @@ class DeviceListCreateAPIView(
{"message": "Device with this mac address already exists."}, status=400 {"message": "Device with this mac address already exists."}, status=400
) )
mac_details = get_mac_address_details(mac) mac_details = get_mac_address_details(mac)
if mac_details.vendor == "Unknown": if not mac_details.ok:
return Response({"message": "MAC address vendor not found."}, status=400) return Response({"message": "MAC address vendor not found."}, status=400)
mac = re.sub(NORMALIZE_MAC_REGEX, "-", mac).upper() mac = re.sub(NORMALIZE_MAC_REGEX, "-", mac).upper()
@ -154,6 +155,7 @@ class MacResponse:
mac_address: str mac_address: str
vendor: str vendor: str
detail: str | None = None detail: str | None = None
ok: Boolean = True
def get_mac_address_details(mac: str) -> MacResponse: def get_mac_address_details(mac: str) -> MacResponse:
@ -167,6 +169,7 @@ def get_mac_address_details(mac: str) -> MacResponse:
mac_address=json_data.get("mac_address", mac), mac_address=json_data.get("mac_address", mac),
vendor=json_data.get("vendor", ""), vendor=json_data.get("vendor", ""),
detail=json_data.get("detail"), detail=json_data.get("detail"),
ok=json_data.get("ok", True),
) )
else: else:
return MacResponse(mac_address=mac, vendor="Unknown", detail=None) return MacResponse(mac_address=mac, vendor="Unknown", detail=None, ok=False)