1dc96e86fc
- User blocking (with reason) now closes the auth gap immediately — a
blocked user's still-valid access token stops working on the next
request, not just on their next OTP/refresh.
- Admin-created reports (moderation notes) per user, viewable in a history
list independent of block status.
- GET /admin/users: full paginated, searchable user list with report counts.
- GET /admin/matches: all matches across the app ("friends" who mutually
liked each other), for admin visibility.
- GET/DELETE /admin/photos: paginated feed of every uploaded photo with
uploader info, so admins can review and remove content without going
user-by-user.
- Per-user activity: monitoring requests can now be filtered by user_id, so
a user's detail page can show their recent API activity.
- Batched the profile-selections query in fullProfilePayload (was 6 queries
per view, now 1) for consistency with the earlier N+1 fixes.
114 lines
3.8 KiB
Go
114 lines
3.8 KiB
Go
package handler
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
|
|
"dating-app/internal/dto"
|
|
"dating-app/internal/middleware"
|
|
"dating-app/internal/models"
|
|
"dating-app/internal/repository"
|
|
"dating-app/internal/service"
|
|
"dating-app/internal/utils"
|
|
)
|
|
|
|
// currentUser کاربر جاری رو از context (که توسط AuthRequired ست شده) استخراج میکنه
|
|
func currentUser(c *gin.Context) (*models.User, bool) {
|
|
val, exists := c.Get(middleware.ContextUserKey)
|
|
if !exists {
|
|
utils.Fail(c, http.StatusUnauthorized, "احراز هویت لازم است", nil)
|
|
return nil, false
|
|
}
|
|
user, ok := val.(*models.User)
|
|
if !ok {
|
|
utils.Fail(c, http.StatusInternalServerError, "خطای داخلی سرور", nil)
|
|
return nil, false
|
|
}
|
|
return user, true
|
|
}
|
|
|
|
func toUserProfile(u *models.User) dto.UserProfile {
|
|
profile := dto.UserProfile{
|
|
ID: u.ID,
|
|
Phone: u.Phone,
|
|
FirstName: u.FirstName,
|
|
CurrentStep: int(u.CurrentStep),
|
|
IsOnboarded: u.IsOnboarded,
|
|
ApprovalStatus: string(u.ApprovalStatus),
|
|
RejectionReason: u.RejectionReason,
|
|
IsAdmin: u.IsAdmin,
|
|
HeightCM: u.HeightCM,
|
|
WeightKG: u.WeightKG,
|
|
State: string(u.State),
|
|
BlockedReason: u.BlockedReason,
|
|
BlockedAt: u.BlockedAt,
|
|
}
|
|
if u.Gender != nil {
|
|
g := string(*u.Gender)
|
|
profile.Gender = &g
|
|
}
|
|
if u.BirthDate != nil {
|
|
bd := u.BirthDate.Format("2006-01-02")
|
|
profile.BirthDate = &bd
|
|
}
|
|
return profile
|
|
}
|
|
|
|
// selectionSummary یک دستهی انتخابی همراه با عنوان گزینههای انتخابشده
|
|
type selectionSummary struct {
|
|
CategoryKey string `json:"category_key"`
|
|
OptionIDs []uint `json:"option_ids"`
|
|
Titles []string `json:"titles"`
|
|
}
|
|
|
|
// fullProfilePayload پروفایل کامل یک کاربر (اطلاعات پایه + همهی انتخابها/پاسخها)
|
|
// رو میسازه. هم توسط خود کاربر (GET /profile/me) و هم توسط ادمین موقع بررسی
|
|
// درخواست تایید (GET /admin/users/:id) استفاده میشه.
|
|
func fullProfilePayload(
|
|
user *models.User,
|
|
optionRepo *repository.OptionRepository,
|
|
questionRepo *repository.QuestionRepository,
|
|
onboardingService *service.OnboardingService,
|
|
photoRepo *repository.PhotoRepository,
|
|
) gin.H {
|
|
// دستهها از کش خونده میشن (تغییر بهندرت اتفاق میافته)، ولی خودِ
|
|
// انتخابهای کاربر توی همهی دستهها با یک کوئری واحد گرفته میشه؛ قبلاً
|
|
// اینجا بهازای هر ۶ دسته یک کوئری جدا زده میشد.
|
|
keyToCategoryID := make(map[models.CategoryKey]uint, len(models.AllCategoryKeys))
|
|
categoryIDs := make([]uint, 0, len(models.AllCategoryKeys))
|
|
for _, key := range models.AllCategoryKeys {
|
|
cat, err := optionRepo.GetCategoryByKey(key)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
keyToCategoryID[key] = cat.ID
|
|
categoryIDs = append(categoryIDs, cat.ID)
|
|
}
|
|
|
|
selectionsByCategoryID, _ := optionRepo.GetUserSelectionsForCategories(user.ID, categoryIDs)
|
|
|
|
selections := make([]selectionSummary, 0, len(models.AllCategoryKeys))
|
|
for _, key := range models.AllCategoryKeys {
|
|
summary := selectionSummary{CategoryKey: string(key)}
|
|
for _, s := range selectionsByCategoryID[keyToCategoryID[key]] {
|
|
summary.OptionIDs = append(summary.OptionIDs, s.OptionID)
|
|
if s.Option != nil {
|
|
summary.Titles = append(summary.Titles, s.Option.Title)
|
|
}
|
|
}
|
|
selections = append(selections, summary)
|
|
}
|
|
|
|
answers, _ := questionRepo.GetUserAnswers(user.ID)
|
|
photos, _ := photoRepo.ListByUser(user.ID)
|
|
|
|
return gin.H{
|
|
"user": toUserProfile(user),
|
|
"onboarding_status": onboardingService.GetStatus(user),
|
|
"selections": selections,
|
|
"profile_answers": answers,
|
|
"photos": photos,
|
|
}
|
|
}
|