Deploy files from GitHub repository

controllers/venue_controller.go

@@ -9,6 +9,7 @@ import (
 )
 
 type VenueController interface {
+	GetAllVenues(ctx *gin.Context)
 	GetOwnerVenues(ctx *gin.Context)
 	GetVenueDetail(ctx *gin.Context)
 	CreateVenue(ctx *gin.Context)
@@ -22,6 +23,29 @@ func NewVenueController(venueService services.VenueService) VenueController {
 	return &venueController{venueService: venueService}
 }
 
+// GetAllVenues godoc
+// @Summary      Get all venues
+// @Description  Returns a paginated list of all venues.
+// @Tags         Venue
+// @Produce      json
+// @Param        page   query  int  false  "Page number (default: 1)"
+// @Param        limit  query  int  false  "Items per page (default: 10, max: 50)"
+// @Success      200  {object}  dto.VenueListResponse
+// @Failure      500  {object}  dto.ErrorResponse
+// @Router       /api/v1/venues [get]
+func (c *venueController) GetAllVenues(ctx *gin.Context) {
+	page, _ := strconv.Atoi(ctx.DefaultQuery("page", "1"))
+	limit, _ := strconv.Atoi(ctx.DefaultQuery("limit", "10"))
+
+	result, err := c.venueService.GetAllVenues(ctx.Request.Context(), page, limit)
+	if err != nil {
+		ResponseJSON(ctx, "", result, err)
+		return
+	}
+
+	ResponseJSON(ctx, "", result, nil)
+}
+
 // GetOwnerVenues godoc
 // @Summary      Get owner's venues
 // @Description  Returns a paginated list of venues owned by the current user.

models/dto/user_dto.go

@@ -18,6 +18,7 @@ type UpdateAboutYouRequest struct {
 	Province      *string    `json:"province"`
 	City          *string    `json:"city"`
 	DanceLevel    *string    `json:"dance_level"`
+	Rank          *string    `json:"rank"`
 	Interest      []string   `json:"interest"`
 	OtherInterest *string    `json:"other_interest"`
 	Description   *string    `json:"description"`
@@ -47,6 +48,7 @@ type UserProfileResponse struct {
 
 	Gender        *string `json:"gender"`
 	DanceLevel    *string `json:"dance_level"`
+	Rank          *string `json:"rank"`
 	Province      *string `json:"province"`
 	City          *string `json:"city"`
 	Description   *string `json:"description"`

models/dto/venue_dto.go

@@ -47,8 +47,10 @@ type VenueDetailOwner struct {
 }
 
 type VenueDetailMap struct {
-	VenueName string `json:"venue_name"`
-	Address   string `json:"address"`
+	VenueName string  `json:"venue_name"`
+	Address   string  `json:"address"`
+	Latitude  float64 `json:"latitude"`
+	Longitude float64 `json:"longitude"`
 }
 
 type VenueDetailRatings struct {

models/entity/entity.go

@@ -22,6 +22,7 @@ type User struct {
 	Nickname          string         `json:"nickname,omitempty"`
 	Gender            *string        `json:"gender,omitempty"`
 	DanceLevel        *string        `json:"dance_level,omitempty"`
+	Rank              *string        `json:"rank,omitempty"`
 	Province          *string        `json:"province,omitempty"`
 	City              *string        `json:"city,omitempty"`
 	Description       *string        `gorm:"type:text" json:"description,omitempty"`

repositories/venue_repository.go

@@ -9,6 +9,7 @@ import (
 )
 
 type VenueRepository interface {
+	GetVenues(ctx context.Context, limit, offset int) ([]entity.Venue, int64, error)
 	GetVenuesByOwnerUserID(ctx context.Context, userID string, limit, offset int) ([]entity.Venue, int64, error)
 	GetVenueByID(ctx context.Context, id string) (entity.Venue, error)
 	GetVenueOwnerByUserID(ctx context.Context, userID string) (*entity.VenueOwner, error)
@@ -25,6 +26,25 @@ func NewVenueRepository(db *gorm.DB) VenueRepository {
 	return &venueRepository{db}
 }
 
+func (r *venueRepository) GetVenues(ctx context.Context, limit, offset int) ([]entity.Venue, int64, error) {
+	var venues []entity.Venue
+	var total int64
+
+	base := r.db.WithContext(ctx).Model(&entity.Venue{})
+
+	if err := base.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	err := base.
+		Preload("Owner").
+		Limit(limit).
+		Offset(offset).
+		Find(&venues).Error
+
+	return venues, total, err
+}
+
 func (r *venueRepository) GetVenuesByOwnerUserID(ctx context.Context, userID string, limit, offset int) ([]entity.Venue, int64, error) {
 	var venues []entity.Venue
 	var total int64

router/venue_router.go

@@ -10,6 +10,7 @@ func VenueRouterSetup(rg *gin.Engine, ctrl provider.ControllerProvider, mw provi
 	v1Group.Use(mw.ProvideAuthenticationMiddleware().VerifyAccount)
 
 	venueController := ctrl.ProvideVenueController()
+	v1Group.GET("", venueController.GetAllVenues)
 	v1Group.POST("", venueController.CreateVenue)
 	v1Group.GET("/me", venueController.GetOwnerVenues)
 	v1Group.GET("/:id", venueController.GetVenueDetail)

services/class_service.go

@@ -120,7 +120,9 @@ func (s *classService) buildInstructor(instructor entity.Instructor) dto.ClassIn
 		Subtitle:         repositories.InstructorDefaultSubtitle,
 		IsMessageEnabled: true,
 	}
-	if instructor.Rank != "" {
+	if instructor.User.Rank != nil && *instructor.User.Rank != "" {
+		info.Title = fmt.Sprintf("%s - Dance Instructor", *instructor.User.Rank)
+	} else if instructor.Rank != "" {
 		info.Title = fmt.Sprintf("%s - Dance Instructor", instructor.Rank)
 	}
 	if instructor.User.ProfileMedia != nil {

services/user_service.go

@@ -149,6 +149,7 @@ func mapUserToProfileResponse(user entity.User) dto.UserProfileResponse {
 		Age:          user.Age,
 		Gender:       user.Gender,
 		DanceLevel:   user.DanceLevel,
+		Rank:         user.Rank,
 		Province:     user.Province,
 		City:         user.City,
 		Description:  user.Description,
@@ -198,6 +199,9 @@ func (s *userService) UpdateAboutYou(ctx context.Context, id string, req dto.Upd
 	if req.DanceLevel != nil {
 		user.DanceLevel = req.DanceLevel
 	}
+	if req.Rank != nil {
+		user.Rank = req.Rank
+	}
 	if req.Province != nil {
 		user.Province = req.Province
 	}

services/venue_service.go

@@ -14,6 +14,7 @@ import (
 )
 
 type VenueService interface {
+	GetAllVenues(ctx context.Context, page, limit int) (dto.VenueListResponse, error)
 	GetOwnerVenues(ctx context.Context, userID string, page, limit int) (dto.VenueListResponse, error)
 	GetVenueDetail(ctx context.Context, id string) (dto.VenueDetailResponse, error)
 	CreateVenue(ctx context.Context, userID string, req dto.CreateVenueRequest) (dto.VenueDetailResponse, error)
@@ -130,6 +131,8 @@ func (s *venueService) GetVenueDetail(ctx context.Context, id string) (dto.Venue
 		Map: dto.VenueDetailMap{
 			VenueName: venue.Name,
 			Address:   venue.Address,
+			Latitude:  venue.Latitude,
+			Longitude: venue.Longitude,
 		},
 		Facilities:      facilitiesResponse,
 		ExtraFacilities: extraFacilities,
@@ -143,6 +146,60 @@ func (s *venueService) GetVenueDetail(ctx context.Context, id string) (dto.Venue
 	}, nil
 }
 
+func (s *venueService) GetAllVenues(ctx context.Context, page, limit int) (dto.VenueListResponse, error) {
+	if limit <= 0 || limit > 50 {
+		limit = 10
+	}
+	if page <= 0 {
+		page = 1
+	}
+	offset := (page - 1) * limit
+
+	venues, total, err := s.venueRepo.GetVenues(ctx, limit, offset)
+	if err != nil {
+		return dto.VenueListResponse{}, err
+	}
+
+	results := make([]dto.VenueResponse, 0, len(venues))
+	for _, v := range venues {
+		status := "Active"
+		if v.VerificationStatus != "" {
+			status = v.VerificationStatus
+		}
+
+		location := fmt.Sprintf("%s, %s", v.City, v.Province)
+		if v.City == "" && v.Province == "" {
+			location = "Unknown Location"
+		}
+
+		results = append(results, dto.VenueResponse{
+			ID:       v.ID,
+			Name:     v.Name,
+			Price:    fmt.Sprintf("Rp%.0f / hour", v.MinimumConsumption),
+			Status:   status,
+			Rooms:    fmt.Sprintf("%d Person Capacity", v.Capacity),
+			Location: location,
+			Image:    s.extractThumbnailFromVenueMedia(v.VenueMedia),
+		})
+	}
+
+	totalPages := int(total) / limit
+	if int(total)%limit != 0 {
+		totalPages++
+	}
+
+	return dto.VenueListResponse{
+		Venues: results,
+		Pagination: dto.Pagination{
+			Page:        page,
+			Limit:       limit,
+			TotalItems:  int(total),
+			TotalPages:  totalPages,
+			HasNextPage: page < totalPages,
+		},
+	}, nil
+}
+
 func (s *venueService) GetOwnerVenues(ctx context.Context, userID string, page, limit int) (dto.VenueListResponse, error) {
 	if limit <= 0 || limit > 50 {
 		limit = 10