♻️ (game.py, signals.py): Refactor comparison operators for better readability

🔧 (apps.py): Import signals in ready method to ensure signals are loaded when the app starts
🔧 (pyproject.toml): Add PGH004 to lint ignore list to avoid linting errors related to PostgreSQL-specific code

.gitea/workflows/on_release.yml

@@ -40,26 +40,16 @@ jobs:
                 "email": "'$USERNAME'",
                 "password": "'$PASSWORD'"
             }' | jq -r '.token')
-          # curl --location --silent 'https://deployer.makecodes.dev/deploy' \
+          curl --location --silent 'https://deployer.makecodes.dev/deploy' \
-          #   --header 'Content-Type: application/json' \
+            --header 'Content-Type: application/json' \
-          #   --header "Authorization: Bearer $TOKEN" \
+            --header "Authorization: Bearer $TOKEN" \
-          #   --data '{
+            --data '{
-          #       "image": "docker.nexus.makecodes.dev/makecodes/nfe-vision",
+                "image": "docker.nexus.makecodes.dev/mines/backend",
-          #       "service": "nfe-vision_app",
+                "service": "mines_backend",
-          #       "version": "${{ github.ref_name }}",
+                "version": "${{ github.ref_name }}",
-          #       "pipeline": "${{ github.run_number }}",
+                "pipeline": "${{ github.run_number }}",
-          #       "repository": "makecodes/nfe-vision"
+                "repository": "mines/backend"
-          #   }'
+            }'
-          #   curl --location --silent 'https://deployer.makecodes.dev/deploy' \
-          #   --header 'Content-Type: application/json' \
-          #   --header "Authorization: Bearer $TOKEN" \
-          #   --data '{
-          #       "image": "docker.nexus.makecodes.dev/makecodes/nfe-vision",
-          #       "service": "nfe-vision_worker",
-          #       "version": "${{ github.ref_name }}",
-          #       "pipeline": "${{ github.run_number }}",
-          #       "repository": "makecodes/nfe-vision"
-          #   }'
         env:
           USERNAME: ${{ secrets.SERVER_AUTH_USERNAME }}
           PASSWORD: ${{ secrets.SERVER_AUTH_PASSWORD }}

api/resources/game.py

@@ -46,7 +46,6 @@ class GameEventResource(APIView):
 
     def post(self, request, game_id):
         """Creates a new event"""
-
         try:
             game = Game.objects.get(pk=game_id)
         except Game.DoesNotExist:

app/settings.py

@@ -12,7 +12,7 @@ OP_ITEM_TITLE = os.environ.get('OP_ITEM_TITLE', 'mines')
 op_env = OnePassword(SCOPE, OP_ITEM_TITLE)
 
 sentry_sdk.init(
-    dsn=op_env.get('settings.SENTRY_DSN'),
+    dsn=op_env.get('SENTRY_DSN'),
     integrations=[DjangoIntegration()],
     environment=SCOPE,
     send_default_pii=False,
@@ -23,12 +23,12 @@ sentry_sdk.init(
 BASE_DIR = Path(__file__).resolve().parent.parent
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = op_env.get('settings.SECRET_KEY')
+SECRET_KEY = op_env.get('SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = op_env.get('settings.DEBUG', '0') in ['1', 'true']
+DEBUG = op_env.get('DEBUG', '0') in ['1', 'true']
 
-ALLOWED_HOSTS = op_env.get('settings.ALLOWED_HOSTS', '127.0.0.1,localhost').split(',')
+ALLOWED_HOSTS = op_env.get('ALLOWED_HOSTS', '127.0.0.1,localhost').split(',')
 
 # Application definition
 INSTALLED_APPS = [
@@ -131,8 +131,7 @@ REST_FRAMEWORK = {
     'DEFAULT_RENDERER_CLASSES': ('rest_framework.renderers.JSONRenderer',),
 }
 
-if DEBUG is True:
+CORS_ALLOW_ALL_ORIGINS = True
-    CORS_ALLOW_ALL_ORIGINS = True
 
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

app/urls.py

@@ -1,13 +1,7 @@
-from django.conf import settings
 from django.contrib import admin
 from django.urls import include, path
 
 urlpatterns = [
     path('', include('api.urls')),
-]
-
-# We need this only for development purpose
-if settings.DEBUG is True:
-    urlpatterns += [
     path('admin/', admin.site.urls),
-    ]
+]

app/utils.py

@@ -1,25 +0,0 @@
-import onepasswordconnectsdk
-from onepasswordconnectsdk.client import Client, new_client_from_environment
-
-
-def get_op_config():
-    op_client: Client = new_client_from_environment()
-
-    OP_DJANGO_SETTINGS_VARS = [
-        'database.host',
-        'database.port',
-        'database.name',
-        'database.user',
-        'database.password',
-        'settings.ALLOWED_HOSTS',
-        'settings.DEBUG',
-        'settings.SCOPE',
-        'settings.SENTRY_DSN',
-        'settings.SECRET_KEY',
-    ]
-
-    op_config_get = {}
-    for var in OP_DJANGO_SETTINGS_VARS:
-        op_config_get[var] = {'opitem': 'mines', 'opfield': var}
-
-    return onepasswordconnectsdk.load_dict(op_client, op_config_get)

game/apps.py

@@ -7,4 +7,4 @@ class GameConfig(AppConfig):
     verbose_name_plural = 'Games'
 
     def ready(self):
-        pass
+        from game import signals # noqa

game/signals.py

@@ -8,7 +8,7 @@ from .models import EventTypes, Game, GameEvent, GameStatuses
 @receiver(post_save, sender=Game)
 def game_start(sender, signal, instance, **kwargs):
     """If the game was just created, insert the first event START_GAME"""
-    if not instance.status == GameStatuses.NOT_PLAYED:
+    if instance.status != GameStatuses.NOT_PLAYED:
         return
     GameEvent.objects.get_or_create(game=instance, type=EventTypes.START_GAME)
 
@@ -16,7 +16,7 @@ def game_start(sender, signal, instance, **kwargs):
 @receiver(pre_save, sender=GameEvent)
 def identify_click_event(sender, signal, instance, **kwargs):
     """Verify what is on the naive click: mine, point or empty"""
-    if not instance.type == EventTypes.CLICK_NAIVE:
+    if instance.type != EventTypes.CLICK_NAIVE:
         return
 
     if instance.row is None and instance.col is None:

pyproject.toml

@@ -74,6 +74,7 @@ lint.ignore = [
     "RUF012",
     "N806",
     "ARG002",
+    "PGH004",
 	"N805", # Missing type annotation for self in method (Pydantic don't like this)
 	"SIM108",  # Use ternary operator {contents} instead of if-else-block
 	"RUF009",  # Missing dataclass field.