Merge branch 'staging' into dev-luckspt-company-tasks

Author: Francisca105

backend/src/mongodb/company.go

@@ -911,10 +911,10 @@ func (c *CompaniesType) UpdateCompanyParticipationStatus(companyID primitive.Obj
 
 // UpdateCompanyData is the data used to update a company, using the method UpdateCompany.
 type UpdateCompanyData struct {
-	Name        *string                 `json:"name"`
-	Description *string                 `json:"description"`
-	Site        *string                 `json:"site"`
-	LinkedIn    *string                 `json:"linkedin"`
+	Name        *string                    `json:"name"`
+	Description *string                    `json:"description"`
+	Site        *string                    `json:"site"`
+	LinkedIn    *string                    `json:"linkedin"`
 	BillingInfo *models.CompanyBillingInfo `json:"billingInfo"`
 }
 
@@ -1434,6 +1434,52 @@ func (c *CompaniesType) DeleteCompanyParticipation(companyID primitive.ObjectID,
 	return &updatedCompany, nil
 }
 
+// AnnounceAcceptedCompanies changes all companies with ACCEPTED status on the
+// current event to ANNOUNCED. Returns the number of companies updated.
+func (c *CompaniesType) AnnounceAcceptedCompanies() (int64, error) {
+	ctx := context.Background()
+
+	currentEvent, err := Events.GetCurrentEvent()
+	if err != nil {
+		return 0, err
+	}
+
+	filter := bson.M{
+		"participations": bson.M{
+			"$elemMatch": bson.M{
+				"event":  currentEvent.ID,
+				"status": models.Accepted,
+			},
+		},
+	}
+
+	update := bson.M{
+		"$set": bson.M{
+			"participations.$[elem].status": models.Announced,
+		},
+	}
+
+	arrayFilters := options.ArrayFilters{
+		Filters: []interface{}{
+			bson.M{
+				"elem.event":  currentEvent.ID,
+				"elem.status": models.Accepted,
+			},
+		},
+	}
+
+	opts := options.Update().SetArrayFilters(arrayFilters)
+
+	result, err := c.Collection.UpdateMany(ctx, filter, update, opts)
+	if err != nil {
+		return 0, err
+	}
+
+	ResetCurrentPublicCompanies()
+
+	return result.ModifiedCount, nil
+}
+
 // FindThread finds a thread in a company
 func (c *CompaniesType) FindThread(threadID primitive.ObjectID) (*models.Company, error) {
 

backend/src/router/company.go

@@ -1454,3 +1454,17 @@ func syncCompanyGmailMessages(w http.ResponseWriter, r *http.Request) {
 		"total":  len(data.Messages),
 	})
 }
+
+// announceAcceptedCompanies changes all companies with ACCEPTED participation
+// on the current event to ANNOUNCED. Coordinator-only.
+func announceAcceptedCompanies(w http.ResponseWriter, r *http.Request) {
+	count, err := mongodb.Companies.AnnounceAcceptedCompanies()
+	if err != nil {
+		http.Error(w, "Could not announce accepted companies: "+err.Error(), http.StatusExpectationFailed)
+		return
+	}
+
+	json.NewEncoder(w).Encode(map[string]interface{}{
+		"announced": count,
+	})
+}

backend/src/router/init.go

@@ -158,6 +158,7 @@ func InitializeRouter() {
 	companyRouter.HandleFunc("/{id}", authCoordinator(deleteCompany)).Methods("DELETE")
 	// query companies by multiple member IDs
 	companyRouter.HandleFunc("/byMembers", authMember(getCompaniesByMembers)).Methods("POST")
+	companyRouter.HandleFunc("/announce", authCoordinator(announceAcceptedCompanies)).Methods("POST")
 	companyRouter.HandleFunc("/{id}/subscribe", authMember(subscribeToCompany)).Methods("PUT")
 	companyRouter.HandleFunc("/{id}/unsubscribe", authMember(unsubscribeToCompany)).Methods("PUT")
 	companyRouter.HandleFunc("/{id}/image/internal", authMember(setCompanyPrivateImage)).Methods("POST")

frontend/.husky/commit-msg

@@ -1,2 +1,2 @@
-
-npx --yes commitlint --config frontend/commitlint.config.js --edit "$1"
+cd "$(dirname "$0")/.."  # goes to frontend/
+npx --yes commitlint --config ./commitlint.config.js --edit "$1"

frontend/package-lock.json

@@ -21,14 +21,14 @@
     "@pinia/colada": "^0.17.1",
     "@tailwindcss/vite": "^4.1.11",
     "@vee-validate/zod": "^4.15.1",
-    "@vueuse/core": "^13.6.0",
+    "@vueuse/core": "^13.9.0",
     "@vueuse/integrations": "^13.6.0",
     "axios": "^1.11.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-vue-next": "^0.536.0",
     "pinia": "^3.0.3",
-    "reka-ui": "^2.7.0",
+    "reka-ui": "^2.8.0",
     "tailwind-merge": "^3.3.1",
     "tailwindcss": "^4.1.11",
     "tw-animate-css": "^1.3.6",

frontend/package.json

@@ -6,6 +6,7 @@
   <!-- <AuthLoader v-if="authStore.isInitializing" /> -->
   <router-view />
 
+  <GlobalConfetti />
   <ToastContainer />
   <PiniaColadaDevtools />
 </template>
@@ -14,6 +15,7 @@
 import { PiniaColadaDevtools } from "@pinia/colada-devtools";
 import { useAuthStore } from "@/stores/auth";
 import ToastContainer from "@/components/ui/toast/ToastContainer.vue";
+import GlobalConfetti from "@/components/GlobalConfetti.vue";
 
 const authStore = useAuthStore();
 

frontend/src/App.vue

@@ -151,3 +151,6 @@ export const generateCompanyContract = (
 
 export const updateCompanyTasks = (id: string, tasks: CompanyTasks) =>
   instance.put<Company>(`/companies/${id}/participation/tasks`, { tasks });
+
+export const announceAcceptedCompanies = () =>
+  instance.post<{ announced: number }>("/companies/announce");

frontend/src/api/companies.ts

@@ -156,11 +156,8 @@
                 : 'justify-start',
           ]"
         >
-          <!-- Author avatar for messages (on the left side) -->
-          <div
-            v-if="thread.kind !== ThreadKind.ThreadKindPhoneCall"
-            class="flex flex-col items-center gap-1"
-          >
+          <!-- Author avatar for messages (including phone calls) -->
+          <div class="flex flex-col items-center gap-1">
             <Image
               v-if="getAuthorAvatar(getMessageAuthor(thread))"
               :src="getAuthorAvatar(getMessageAuthor(thread))"
@@ -958,14 +955,20 @@ watch(
 
 const getMessageDirection = (kind: ThreadKind): "incoming" | "outgoing" => {
   return kind === ThreadKind.ThreadKindTo ||
-    kind === ThreadKind.ThreadKindTemplate
+    kind === ThreadKind.ThreadKindTemplate ||
+    kind === ThreadKind.ThreadKindPhoneCall
     ? "outgoing"
     : "incoming";
 };
 
 const getMessageAuthor = (thread: ThreadWithEntry): Author | null => {
   const direction = getMessageDirection(thread.kind);
 
+  // For phone calls, always show the member who made the call
+  if (thread.kind === ThreadKind.ThreadKindPhoneCall && thread.entry?.member) {
+    return getMemberById(thread.entry.member);
+  }
+
   if (direction === "outgoing" && thread.entry?.member) {
     return getMemberById(thread.entry?.member);
   } else if (direction === "incoming") {