diff --git a/services/apps/git_integration/src/crowdgit/services/commit/commit_service.py b/services/apps/git_integration/src/crowdgit/services/commit/commit_service.py index 647147feeb..3f914a8d57 100644 --- a/services/apps/git_integration/src/crowdgit/services/commit/commit_service.py +++ b/services/apps/git_integration/src/crowdgit/services/commit/commit_service.py @@ -49,7 +49,6 @@ class CommitService(BaseService): _GIT_PLATFORM = "git" _USERNAME_TYPE = "username" _EMAIL_TYPE = "email" - _COMMITTED_COMMIT_SUFFIX = "commited-commit" MAX_CHUNK_SIZE = 250 @@ -517,8 +516,10 @@ def create_activities_from_commit( # Only create committer activity if author and committer are different if author_name != committer_name or author_email != committer_email: - # Pre-calculate hash components to avoid repeated string operations - hash_input = f"{commit_hash}{CommitService._COMMITTED_COMMIT_SUFFIX}{committer_email}" + # IMPORTANT: hash_input has a typo in "commited" instead of "committed" + # however fixing it requires recalculating sourceId/parentSourceId for ALL git activities in db + # so far the typo doesn't have any major effect, since the activity type "committed-commit" is correct + hash_input = f"{commit_hash}commited-commit{committer_email}" committer_source_id = hashlib.sha1(hash_input.encode("utf-8")).hexdigest() committer = { diff --git a/services/apps/git_integration/src/crowdgit/services/maintainer/maintainer_service.py b/services/apps/git_integration/src/crowdgit/services/maintainer/maintainer_service.py index f39440d472..7c6975366d 100644 --- a/services/apps/git_integration/src/crowdgit/services/maintainer/maintainer_service.py +++ b/services/apps/git_integration/src/crowdgit/services/maintainer/maintainer_service.py @@ -442,10 +442,6 @@ async def process_maintainers( try: owner, repo_name = parse_repo_url(batch_info.remote) - if owner == "envoyproxy": # TODO: remove this once we figure out why it was disabled - self.logger.warning("Skiping maintainers processing for 'envoyproxy' repositories") - # Skip envoyproxy repos (based on previous logic https://github.com/CrowdDotDev/git-integration/blob/06d6395e57d9aad7f45fde2e3d7648fb7440f83b/crowdgit/maintainers.py#L86) - return has_interval_elapsed, remaining_hours = await self.check_if_interval_elapsed( repository