fix: resolve unresolved merge remnants breaking compilation - #1083
Open
annieolivia61-ux wants to merge 1 commit into
Open
annieolivia61-ux wants to merge 1 commit into
annieolivia61-ux wants to merge 1 commit into
Conversation
…Uzima#1080) - app.module.ts: remove branch-name junk lines and duplicate AppModule; restore ConfigService import - restore CouponStatus enum + coupon entity columns lost in consolidation; repoint coupon/activity-feed imports to canonical entity - repair truncated admin.service statusGroups aggregation - deduplicate users.module providers/imports; register Coupon + HealthTask - restore stripped template literals in gamification/achievement services - fix notification services: missing Injectable/Logger import, sendEmail wrapper - fix activity-tracker interceptor import path; add UsersService.updateLastActiveAt - add TaskService facade for orphaned reminder scheduler - replace task-analytics.service (was clobbered with spec content) with real implementation passing its full spec suite (14/14) - inject ActivityLogService into health-tasks controller/module (+TaskActivity entity) - add HealthTasksService.getUserTasks used by GET /health-tasks - fix scheduler.module UsersModule import path - deps: add @nest-lab/throttler-storage-redis (old package name does not exist), bump reflect-metadata to ^0.2.2, add missing eslint-config-prettier dev dep Build errors: 306 -> 124 (zero remaining in touched files)
Uyoxy
approved these changes
Aug 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #1080
Summary
src/app.module.tscontained unresolved git-merge-conflict remnants (branch-name junk lines, a duplicate emptyexport class AppModule {}, and a missingConfigServiceimport) that broke compilation of the entire app. This PR resolves the issue per its acceptance criteria and repairs the same family of merge damage across 24 additional files.Issue acceptance criteria (all pass)
feat/gamification-engine/mainconflict-junk lines remain inapp.module.tsexport class AppModuleGamificationModuleandNotificationCenterModuleeach imported once and registered onceconfigure()appliesRequestIdMiddlewarefor all routes@Module({ imports: [...] })complete)Same-family merge-damage repairs
CouponStatusenum + coupon entity columns lost in commit 56bb294; repointed imports to canonical entityadmin.servicestatusGroups aggregation and error castsusers.moduleprovider/imports; registered missing entitiesgamification.service/achievement.serviceInjectable/Loggerimport, addedsendEmail()wrapper used by data-export processoractivity-tracker.interceptorimport path; addedUsersService.updateLastActiveAtTaskServicefacade for the orphaned reminder schedulertask-analytics.service(the file had been clobbered with its own spec content): real implementation now passes the full stranded spec suite, 14/14 tests greenActivityLogServiceinto health-tasks controller/module; addedHealthTasksService.getUserTasksbackingGET /health-tasksscheduler.moduleUsersModule path; merged duplicated DTO/swagger importsDependency fixes
@nest-lab/throttler-storage-redis— the previous@nestjs/throttler-storage-redispackage does not exist on npm, so installs failed for everyonereflect-metadatato^0.2.2(peer requirement)eslint-config-prettierdev dependency — without iteslintcrashes repo-wide and the Lint job cannot run at allVerification
tsc: build errors reduced 306 → 124; zero errors remain in any file this PR touches. All 124 remaining errors are pre-existing onmain(transaction.examples, avatar service, auth users.service, etc.) and are listed as follow-ups below.mainshows no regressions — no previously-passing suite fails;activity-feed.service.spec.tsandtask-analytics.service.spec.ts(14 tests) newly pass.--check.Honest CI note
mainitself is currently red on every recent run of theCIworkflow (build/lint/test all fail independently of this PR). This PR strictly reduces failures but cannot turn every job green without repairing the remaining pre-existing damage, which is out of scope for #1080.Suggested follow-ups
TaskCategoryentity (duplicated betweentasks/entities/health-task.entityanddatabase/entities/task-category.entity)NotificationServiceimplementations (shared vs notifications module)🤖 Generated with opencode