V3 dev

Dockerfile

@@ -18,10 +18,12 @@ RUN go build -o bin/vitty
 FROM alpine:3.15 AS runner
 
 WORKDIR /usr/src/app
+RUN mkdir ./data
 
 COPY --from=builder /usr/src/app/bin/vitty ./bin/vitty
 
 COPY --from=builder /usr/src/app/credentials ./credentials
+COPY --from=builder /usr/src/app/data ./data
 
 
 RUN apk --no-cache add tzdata

README.md

@@ -143,7 +143,7 @@ vitty.bat cli <command>
 <br>
 
 ## API Documentation
-Postman API documentation - [Vitty API](https://documenter.getpostman.com/view/23405999/2s93zFWeZx)
+Postman API documentation - [Vitty API](https://documenter.getpostman.com/view/29639924/2sAYJ7fJWD)
 
 <br>
 <br>

vitty-backend-api/admin/pkg/handler.go

@@ -7,7 +7,11 @@ import (
 	"net/http"
 	"reflect"
 
+	"github.com/GDGVIT/vitty-backend/vitty-backend-api/api/middleware"
+	"github.com/GDGVIT/vitty-backend/vitty-backend-api/cli/commands"
+	"github.com/gofiber/fiber/v2"
 	"github.com/labstack/echo/v4"
+	"github.com/urfave/cli/v2"
 )
 
 type TemplateRenderer struct {
@@ -22,17 +26,20 @@ func (t *TemplateRenderer) Render(w io.Writer, name string, data interface{}, c
 	return t.templates.ExecuteTemplate(w, name, data)
 }
 
-func AdminHandler(app *echo.Echo) {
-	group := app.Group("")
-	group.Use(JWTMiddleware)
-	group.GET("", GetModelsView)
-	group.GET("/:model", GetModelView)
-	group.GET("/:model/create", CreateItemView)
-	group.POST("/:model/create", CreateItem)
-	group.GET("/:model/:id", GetItemView)
-	group.GET("/:model/:id/edit", UpdateItemView)
-	group.PUT("/:model/:id", UpdateItem)
-	group.DELETE("/:model/:id", DeleteItem)
+func AdminHandler(app fiber.Router) {
+	group := app.Group("/admin")
+	group.Use(middleware.JWTAuthMiddleware)
+	group.Use(middleware.IsAdminMiddleware)
+	group.Post("/empty-classrooms/seed", seedEmptyClassrooms)
+
+	// group.Get("", GetModelsView)
+	// group.Get("/:model", GetModelView)
+	// group.Get("/:model/create", CreateItemView)
+	// group.Post("/:model/create", CreateItem)
+	// group.Get("/:model/:id", GetItemView)
+	// group.Get("/:model/:id/edit", UpdateItemView)
+	// group.Put("/:model/:id", UpdateItem)
+	// group.Delete("/:model/:id", DeleteItem)
 }
 
 func GetModelsView(c echo.Context) error {
@@ -212,4 +219,18 @@ func DeleteItem(c echo.Context) error {
 	return c.JSON(http.StatusOK, map[string]interface{}{
 		"message": "Item deleted",
 	})
+
+}
+
+func seedEmptyClassrooms(c *fiber.Ctx) error {
+	err := commands.GenerateEmptyRooms(&cli.Context{})
+	if err != nil {
+		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
+			"error": "classrooms seed failed",
+		})
+	}
+
+	return c.Status(fiber.StatusOK).JSON(fiber.Map{
+		"message": "classrooms has been initialized",
+	})
 }

vitty-backend-api/admin/pkg/service.go

@@ -42,7 +42,7 @@ func (s *AdminSvc) init() {
 			"message": "Hello World",
 		})
 	})
-	AdminHandler(s.WebApp)
+	// AdminHandler(s.WebApp)
 }
 
 func (s *AdminSvc) Register(model ModelInterface) {

vitty-backend-api/api/initialize.go

@@ -5,6 +5,7 @@ import (
 
 	v1 "github.com/GDGVIT/vitty-backend/vitty-backend-api/api/v1"
 	v2 "github.com/GDGVIT/vitty-backend/vitty-backend-api/api/v2"
+	v3 "github.com/GDGVIT/vitty-backend/vitty-backend-api/api/v3"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"
 	"github.com/gofiber/fiber/v2/middleware/logger"
@@ -42,6 +43,7 @@ func NewWebApi() *fiber.App {
 	api := fiberApp.Group("/api")
 	v1.V1Handler(api)
 	v2.V2Handler(api)
+	v3.V3Handler(api)
 
 	return fiberApp
 }

vitty-backend-api/api/serializers/circles.go

@@ -0,0 +1,58 @@
+package serializers
+
+import "github.com/GDGVIT/vitty-backend/vitty-backend-api/internal/models"
+
+func CirclesListSerializer(ucj []models.UsersCirclesJoin) []map[string]interface{} {
+	var result []map[string]interface{}
+
+	for _, userCircle := range ucj {
+
+		out := map[string]interface{}{
+			"circle_id":        userCircle.CID,
+			"circle_role":      userCircle.CircleRole,
+			"circle_name":      userCircle.Circles.CircleName,
+			"circle_join_code": userCircle.Circles.CircleJoinCode,
+		}
+
+		result = append(result, out)
+	}
+
+	return result
+
+}
+
+func CircleRequestsSerializer(circleRequests []models.CircleRequest) []map[string]interface{} {
+	var result []map[string]interface{}
+
+	for _, circleRequest := range circleRequests {
+		out := map[string]interface{}{
+			"from_username": circleRequest.FromUsername,
+			"to_username":   circleRequest.ToUsername,
+			"circle_id":     circleRequest.CID,
+			"circle_name":   circleRequest.Circles.CircleName,
+		}
+		result = append(result, out)
+	}
+
+	return result
+}
+
+func UsersListCircleSerializer(users []models.User) []map[string]interface{} {
+	var result []map[string]interface{}
+
+	for _, user := range users {
+
+		currStatus := user.GetCurrentStatus()
+
+		out := map[string]interface{}{
+			"current_status": currStatus,
+			"username":       user.Username,
+			"name":           user.Name,
+			"picture":        user.Picture,
+			"email":          user.Email,
+		}
+		result = append(result, out)
+	}
+
+	return result
+}

vitty-backend-api/api/serializers/friends.go

@@ -11,3 +11,15 @@ func FriendRequestsSerializer(friend_requests []models.FriendRequest, request_us
 	}
 	return friend_requests_list
 }
+
+func ActiveFriendsSerializer(userFriends *[]models.UserFriends) []map[string]interface{} {
+	var activeFriends []map[string]interface{}
+
+	for _, userFriend := range *userFriends {
+		activeFriends = append(activeFriends, map[string]interface{}{
+			"friend_username": userFriend.FriendUsername,
+			"hide":            userFriend.Hide,
+		})
+	}
+	return activeFriends
+}

vitty-backend-api/api/serializers/notes.go

@@ -0,0 +1,19 @@
+package serializers
+
+import "github.com/GDGVIT/vitty-backend/vitty-backend-api/internal/models"
+
+func NotesSerializer(notes []models.Notes) []map[string]interface{} {
+	var result []map[string]interface{}
+
+	for _, note := range notes {
+		out := map[string]interface{}{
+			"note_id":      note.NoteID,
+			"note_name":    note.NoteName,
+			"note_content": note.NoteContent,
+			"course_id":    note.CourseID,
+			"course_name":  note.Courses.CourseName,
+		}
+		result = append(result, out)
+	}
+	return result
+}

vitty-backend-api/api/serializers/reminders.go

@@ -0,0 +1,18 @@
+package serializers
+
+import "github.com/GDGVIT/vitty-backend/vitty-backend-api/internal/models"
+
+func RemindersSerializer(reminders []models.Reminders) []map[string]interface{} {
+	var result []map[string]interface{}
+
+	for _, reminder := range reminders {
+		out := map[string]interface{}{
+			"reminder_id":      reminder.ReminderId,
+			"reminder_name":    reminder.ReminderName,
+			"reminder_content": reminder.ReminderContent,
+			"reminder_time":    reminder.ReminderTime,
+		}
+		result = append(result, out)
+	}
+	return result
+}

vitty-backend-api/api/serializers/timetable.go

@@ -2,8 +2,8 @@ package serializers
 
 import "github.com/GDGVIT/vitty-backend/vitty-backend-api/internal/models"
 
-func TimetableSerializer(timetable models.Timetable) map[string]interface{} {
-	return map[string]interface{}{
-		"data": timetable.GetDaywiseTimetable(),
+func TimetableSerializer(timetable models.Timetable, campus string) map[string]interface{} {
+	return map[string]any{
+		"data": timetable.GetDaywiseTimetable(campus),
 	}
 }

vitty-backend-api/api/serializers/users.go

@@ -10,6 +10,7 @@ func UserLoginSerializer(user models.User, token string) map[string]interface{}
 		"name":     user.Name,
 		"picture":  user.Picture,
 		"role":     user.Role,
+		"campus":   user.Campus,
 		"token":    token,
 	}
 }
@@ -44,12 +45,18 @@ func UserListSerializer(users []*models.User, request_user models.User) []map[st
 }
 
 func UserSerializer(user models.User, request_user models.User) map[string]interface{} {
+	campus := "vellore"
+	if user.Campus != nil {
+		campus = string(*user.Campus)
+	}
+
 	return map[string]interface{}{
 		"username":             user.Username,
 		"name":                 user.Name,
 		"picture":              user.Picture,
 		"email":                user.Email,
-		"timetable":            TimetableSerializer(user.GetTimeTable()),
+		"campus":               user.Campus,
+		"timetable":            TimetableSerializer(user.GetTimeTable(), campus),
 		"friend_status":        request_user.CheckFriendStatus(user),
 		"friends_count":        user.FriendsCount(),
 		"mutual_friends_count": request_user.CountMutualFriends(user),

vitty-backend-api/api/v1/timetableHandler.go

@@ -44,7 +44,7 @@ func getTimetableV2(c *fiber.Ctx) error {
 		})
 	}
 
-	slots, err := utils.DetectTimetableV2(response.Data)
+	slots, err := utils.DetectTimetableV2(response.Data, "")
 	if err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
 			"detail": err.Error(),

vitty-backend-api/api/v2/authHandler.go

@@ -13,7 +13,7 @@ import (
 	"google.golang.org/api/idtoken"
 )
 
-func authHandler(api fiber.Router) {
+func AuthHandler(api fiber.Router) {
 	group := api.Group("/auth")
 	group.Post("/check-username", checkUsernameValidity)
 	group.Post("/check-user-exists", checkUserExists)
@@ -69,9 +69,10 @@ func checkUserExists(c *fiber.Ctx) error {
 
 func googleLogin(c *fiber.Ctx) error {
 	type RequestBody struct {
-		Id_token string `json:"id_token"`
-		RegNo    string `json:"reg_no,omitempty"`
-		Username string `json:"username,omitempty"`
+		Id_token string         `json:"id_token"`
+		RegNo    string         `json:"reg_no,omitempty"`
+		Username string         `json:"username,omitempty"`
+		Campus   *models.Campus `json:"campus,omitempty"`
 	}
 
 	var body RequestBody
@@ -82,6 +83,13 @@ func googleLogin(c *fiber.Ctx) error {
 		})
 	}
 
+	// Validate campus if provided
+	if body.Campus != nil && !body.Campus.Valid() {
+		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
+			"detail": "Invalid campus. Must be 'vellore' or 'chennai' or 'bhopal'",
+		})
+	}
+
 	idtoken, err := idtoken.Validate(context.Background(), body.Id_token, auth.OauthConf.ClientID)
 	if err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
@@ -101,6 +109,10 @@ func googleLogin(c *fiber.Ctx) error {
 		if user.Picture != idtoken.Claims["picture"].(string) {
 			database.DB.Model(&user).Update("picture", idtoken.Claims["picture"].(string))
 		}
+		// Update campus if provided and different
+		if body.Campus != nil && user.Campus != body.Campus {
+			database.DB.Model(&user).Update("campus", body.Campus)
+		}
 	} else {
 
 		username := strings.ToLower(body.Username)
@@ -114,6 +126,7 @@ func googleLogin(c *fiber.Ctx) error {
 		user.Picture = idtoken.Claims["picture"].(string)
 		user.Username = username
 		user.RegNo = body.RegNo
+		user.Campus = body.Campus
 
 		err = database.DB.Create(&user).Error
 		if err != nil {
@@ -134,9 +147,10 @@ func googleLogin(c *fiber.Ctx) error {
 
 func firebaseLogin(c *fiber.Ctx) error {
 	type RequestBody struct {
-		UUID     string `json:"uuid"`
-		RegNo    string `json:"reg_no,omitempty"`
-		Username string `json:"username,omitempty"`
+		UUID     string         `json:"uuid"`
+		RegNo    string         `json:"reg_no,omitempty"`
+		Username string         `json:"username,omitempty"`
+		Campus   *models.Campus `json:"campus,omitempty"`
 	}
 
 	var body RequestBody
@@ -147,6 +161,12 @@ func firebaseLogin(c *fiber.Ctx) error {
 		})
 	}
 
+	if body.Campus != nil && !body.Campus.Valid() {
+		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
+			"detail": "Invalid campus. Must be 'vellore' or 'chennai' or 'bhopal'",
+		})
+	}
+
 	client, err := auth.FirebaseApp.Auth(context.Background())
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
@@ -172,6 +192,10 @@ func firebaseLogin(c *fiber.Ctx) error {
 		if user.Picture != u_rec.ProviderUserInfo[0].PhotoURL {
 			database.DB.Model(&user).Update("picture", u_rec.ProviderUserInfo[0].PhotoURL)
 		}
+
+		if body.Campus != nil && user.Campus != body.Campus {
+			database.DB.Model(&user).Update("campus", body.Campus)
+		}
 	} else {
 
 		username := strings.ToLower(body.Username)
@@ -187,6 +211,7 @@ func firebaseLogin(c *fiber.Ctx) error {
 		user.Name = u_rec.ProviderUserInfo[0].DisplayName
 		user.Username = username
 		user.RegNo = body.RegNo
+		user.Campus = body.Campus
 		err = database.DB.Create(&user).Error
 		if err != nil {
 			return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{