Skip to content

Commit 868a744

Browse files
committed
Update code
1 parent a79dcd2 commit 868a744

File tree

10 files changed

+26
-23
lines changed

10 files changed

+26
-23
lines changed

backend/apps/owasp/index/project.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ class ProjectIndex(IndexBase):
1616
"idx_custom_tags",
1717
"idx_description",
1818
"idx_forks_count",
19-
"idx_issues_count",
19+
"idx_health_score",
2020
"idx_is_active",
21+
"idx_issues_count",
2122
"idx_key",
2223
"idx_languages",
2324
"idx_leaders",
@@ -27,7 +28,6 @@ class ProjectIndex(IndexBase):
2728
"idx_organizations",
2829
"idx_repositories",
2930
"idx_repositories_count",
30-
"idx_health_score",
3131
"idx_stars_count",
3232
"idx_summary",
3333
"idx_tags",

backend/apps/owasp/management/commands/owasp_update_project_health_requirements.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from django.core.management.base import BaseCommand
44

5-
from apps.owasp.models.enums import ProjectLevel
5+
from apps.owasp.models.enums.project import ProjectLevel
66
from apps.owasp.models.project_health_requirements import ProjectHealthRequirements
77

88

backend/apps/owasp/models/enums/__init__.py

Whitespace-only changes.
File renamed without changes.

backend/apps/owasp/models/mixins/project.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
from __future__ import annotations
44

5+
from django.conf import settings
6+
57
from apps.common.utils import join_values
68
from apps.github.models.repository_contributor import RepositoryContributor
79
from apps.owasp.models.mixins.common import RepositoryBasedEntityModelMixin
@@ -34,6 +36,12 @@ def idx_forks_count(self) -> int:
3436
"""Return forks count for indexing."""
3537
return self.forks_count
3638

39+
@property
40+
def idx_health_score(self) -> float | None:
41+
"""Return health score for indexing."""
42+
# TODO(arkid15r): Enable real health score in production when ready.
43+
return 100 if settings.ENVIRONMENT == "Production" else self.health_score
44+
3745
@property
3846
def idx_is_active(self) -> bool:
3947
"""Return active status for indexing."""
@@ -97,11 +105,6 @@ def idx_repositories_count(self) -> int:
97105
"""Return repositories count for indexing."""
98106
return self.repositories.count()
99107

100-
@property
101-
def idx_health_score(self) -> float | None:
102-
"""Return score for indexing."""
103-
return self.health_score
104-
105108
@property
106109
def idx_stars_count(self) -> int:
107110
"""Return stars count for indexing."""

backend/apps/owasp/models/project.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from apps.github.models.pull_request import PullRequest
1818
from apps.github.models.release import Release
1919
from apps.owasp.models.common import RepositoryBasedEntityModel
20-
from apps.owasp.models.enums import ProjectLevel, ProjectType
20+
from apps.owasp.models.enums.project import ProjectLevel, ProjectType
2121
from apps.owasp.models.managers.project import ActiveProjectManager
2222
from apps.owasp.models.mixins.project import ProjectIndexMixin
2323
from apps.owasp.models.project_health_metrics import ProjectHealthMetrics
@@ -155,16 +155,6 @@ def issues_count(self) -> int:
155155
"""Return count of issues."""
156156
return self.issues.count()
157157

158-
@property
159-
def nest_key(self) -> str:
160-
"""Get Nest key."""
161-
return self.key.replace("www-project-", "")
162-
163-
@property
164-
def nest_url(self) -> str:
165-
"""Get Nest URL for project."""
166-
return get_absolute_url(f"projects/{self.nest_key}")
167-
168158
@property
169159
def last_health_metrics(self) -> ProjectHealthMetrics | None:
170160
"""Return last health metrics for the project."""
@@ -177,6 +167,16 @@ def leaders_count(self) -> int:
177167
"""Return the count of leaders."""
178168
return len(self.leaders_raw)
179169

170+
@property
171+
def nest_key(self) -> str:
172+
"""Get Nest key."""
173+
return self.key.replace("www-project-", "")
174+
175+
@property
176+
def nest_url(self) -> str:
177+
"""Get Nest URL for project."""
178+
return get_absolute_url(f"projects/{self.nest_key}")
179+
180180
@property
181181
def open_issues(self):
182182
"""Return open issues."""

backend/apps/owasp/models/project_health_requirements.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from django.db import models
44

55
from apps.common.models import TimestampedModel
6-
from apps.owasp.models.enums import ProjectLevel
6+
from apps.owasp.models.enums.project import ProjectLevel
77

88

99
class ProjectHealthRequirements(TimestampedModel):

backend/tests/apps/owasp/management/commands/owasp_update_project_health_requirements_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from django.core.management.base import CommandError
77

88
from apps.owasp.management.commands.owasp_update_project_health_requirements import Command
9-
from apps.owasp.models.enums import ProjectLevel
9+
from apps.owasp.models.enums.project import ProjectLevel
1010
from apps.owasp.models.project_health_requirements import ProjectHealthRequirements
1111

1212

backend/tests/apps/owasp/models/project_health_requirements_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pytest
22
from django.core.exceptions import ValidationError
33

4-
from apps.owasp.models.enums import ProjectLevel
4+
from apps.owasp.models.enums.project import ProjectLevel
55
from apps.owasp.models.project_health_requirements import ProjectHealthRequirements
66

77

backend/tests/apps/owasp/models/project_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from apps.github.models.repository import Repository
66
from apps.github.models.user import User
7-
from apps.owasp.models.enums import ProjectLevel, ProjectType
7+
from apps.owasp.models.enums.project import ProjectLevel, ProjectType
88
from apps.owasp.models.project import Project
99

1010

0 commit comments

Comments
 (0)