Merge branch 'master' into 472-complete-communications

Author: sancheslfl

.github/workflows/lint.yml

@@ -0,0 +1,35 @@
+name: Lint and Format on PR
+
+on:
+  pull_request:
+
+jobs:
+  frontend-lint:
+    name: Frontend ESLint & Prettier
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "23"
+          cache: "npm"
+          cache-dependency-path: frontend/package-lock.json
+
+      - name: Install frontend dependencies
+        working-directory: frontend
+        run: npm ci
+
+      - name: Run ESLint (auto-fix)
+        working-directory: frontend
+        run: npm run lint
+
+      - name: Run Prettier check
+        working-directory: frontend
+        run: npx prettier --check .
+
+      - name: Build frontend
+        working-directory: frontend
+        run: npm run build

.gitignore

@@ -122,4 +122,6 @@ deck2.sh
 /ios/Flutter/Release.xcconfig
 /frontend/ios/Flutter/Debug.xcconfig
 /frontend/ios/Flutter/Release.xcconfig
-Podfile
+Podfile
+
+backend/.vendor-new/

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+    "recommendations": [
+        "vue.volar",
+        "golang.go",
+        "esbenp.prettier-vscode",
+        "dbaeumer.vscode-eslint"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,15 @@
+{
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+        "source.fixAll": "always"
+    },
+    "[vue]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[javascript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[typescript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    }
+}

README.md

@@ -8,4 +8,4 @@ Version 2 of eventdeck
 
 ## Documentation
 
-- swagger: http://petstore.swagger.io/?url=http%3A%2F%2Flocalhost%3A8080%2Fstatic%2Fswagger.json#/auth/authCallback
+- swagger: make run-doc

backend/src/config/config.go

@@ -51,7 +51,6 @@ const (
 	keyPort string = "PORT"
 
 	keyDatabaseURI  string = "DB_URL"
-	deckDbURL string = "DECK_DB_URL"
 	keyDatabaseName string = "DB_NAME"
 	keyCallbackURL  string = "CALLBACK_URL"
 
@@ -67,6 +66,7 @@ const (
 	keySpacesKey    string = "DO_SPACES_KEY"
 
 	keyAuthRedirectionURL string = "AUTH_REDIRECTION_URL"
+	keyProduction         string = "PRODUCTION"
 )
 
 func set(variable *string, key string, mandatory bool) {
@@ -75,7 +75,17 @@ func set(variable *string, key string, mandatory bool) {
 	} else if viper.IsSet(key) {
 		*variable = viper.GetString(key)
 	} else if mandatory {
-		log.Fatal(fmt.Sprintf("%s", key) + " not set")
+		log.Fatalf("%s not set", key)
+	}
+}
+
+func setBool(variable *bool, key string, mandatory bool) {
+	if viper.IsSet(keyPrefix + "_" + key) {
+		*variable = viper.GetBool(keyPrefix + "_" + key)
+	} else if viper.IsSet(key) {
+		*variable = viper.GetBool(key)
+	} else if mandatory {
+		log.Fatalf("%s not set", key)
 	}
 }
 
@@ -89,13 +99,13 @@ func InitializeConfig(filename *string) {
 
 	if file {
 		if err := godotenv.Load(*filename); err != nil {
-            fmt.Printf("Error loading .env file: %v\n", err)
-        }
+			fmt.Printf("Error loading .env file: %v\n", err)
+		}
 	}
 
 	viper.SetEnvPrefix(keyPrefix)
 	viper.AutomaticEnv()
-	
+
 	set(&Host, keyHost, false)
 	set(&Port, keyPort, false)
 
@@ -116,6 +126,8 @@ func InitializeConfig(filename *string) {
 
 	set(&AuthRedirectionURL, keyAuthRedirectionURL, true)
 
+	// Load boolean flags from env
+	setBool(&Production, keyProduction, false)
 }
 
 func SetTestingEnv() {

backend/src/models/member.go

@@ -24,8 +24,8 @@ type Member struct {
 	SINFOID string `json:"sinfoid" bson:"sinfoid"`
 
 	// Contact is an _id of Contact (see models.Contact).
-	Contact primitive.ObjectID `json:"contact" bson:"contact"`
-	ContactObject *Contact `json:"contactObject,omitempty" bson:"-"`
+	Contact       primitive.ObjectID `json:"contact" bson:"contact"`
+	ContactObject *Contact           `json:"contactObject,omitempty" bson:"-"`
 }
 
 // MemberPublic is the public information about a member
@@ -37,6 +37,14 @@ type MemberPublic struct {
 	Image string `json:"img" bson:"img"`
 
 	Socials ContactSocials `json:"socials"`
+
+	// Team is the name of the team this member belongs to for the
+	// event being queried (when available). Omitted when not set.
+	Team string `json:"team,omitempty" bson:"-"`
+
+	// SinfoEmail is the member's full SINFO email (e.g. john.doe@sinfo.org).
+	// This is derived from the Member.SINFOID value.
+	SinfoEmail string `json:"sinfo_email,omitempty" bson:"-"`
 }
 
 type AuthorizationCredentials struct {

backend/src/mongodb/company.go

@@ -26,7 +26,7 @@ type CompaniesType struct {
 // Cached version of the public companies for the current event
 var currentPublicCompanies *[]*models.CompanyPublic
 
-//ResetCurrentPublicCompanies resets current public companies
+// ResetCurrentPublicCompanies resets current public companies
 func ResetCurrentPublicCompanies() {
 	currentPublicCompanies = nil
 }
@@ -76,17 +76,17 @@ func (c *CompaniesType) CreateCompany(data CreateCompanyData) (*models.Company,
 		},
 		"mails": []models.ContactMail{},
 	})
-  if err != nil {
-    return nil, err
-  }
+	if err != nil {
+		return nil, err
+	}
 
 	insertResult, err := c.Collection.InsertOne(ctx, bson.M{
 		"name":           data.Name,
 		"description":    data.Description,
 		"site":           data.Site,
 		"employers":      []primitive.ObjectID{},
 		"participations": []models.CompanyParticipation{},
-    "contact":        createdContact.InsertedID.(primitive.ObjectID),
+		"contact":        createdContact.InsertedID.(primitive.ObjectID),
 	})
 
 	if err != nil {
@@ -316,11 +316,11 @@ func companyToPublic(company models.Company, eventID *int) (*models.CompanyPubli
 			var participationObj models.CompanyParticipationPublic
 
 			participationObj = models.CompanyParticipationPublic{
-				Event:   p.Event,
-				Partner: participation.Partner,
-				Package: models.PackagePublic{},
-        StandDetails: participation.StandDetails,
-        Stands: participation.Stands,
+				Event:        p.Event,
+				Partner:      participation.Partner,
+				Package:      models.PackagePublic{},
+				StandDetails: participation.StandDetails,
+				Stands:       participation.Stands,
 			}
 
 			if participation.Package != nil {
@@ -732,16 +732,20 @@ func (c *CompaniesType) UpdateCompanyParticipation(companyID primitive.ObjectID,
 		return nil, err
 	}
 
-	var updateQuery = bson.M{
-		"$set": bson.M{
-			"participations.$.member":    *data.Member,
-			"participations.$.partner":   *data.Partner,
-			"participations.$.notes":     *data.Notes,
-		},
+	setFields := bson.M{
+		"participations.$.member":  *data.Member,
+		"participations.$.partner": *data.Partner,
+		"participations.$.notes":   *data.Notes,
 	}
 
 	if data.Confirmed != nil {
-		updateQuery["participations.$.confirmed"] = data.Confirmed.UTC()
+		setFields["participations.$.confirmed"] = data.Confirmed.UTC()
+	} else {
+		setFields["participations.$.confirmed"] = nil
+	}
+
+	var updateQuery = bson.M{
+		"$set": setFields,
 	}
 
 	var filterQuery = bson.M{"_id": companyID, "participations.event": currentEvent.ID}
@@ -937,39 +941,39 @@ func (c *CompaniesType) UpdateCompanyPublicImage(companyID primitive.ObjectID, u
 func (c *CompaniesType) DeleteCompany(companyID primitive.ObjectID) (*models.Company, error) {
 
 	ctx := context.Background()
-  var company models.Company
+	var company models.Company
 
 	currentCompany, err := Companies.GetCompany(companyID)
 	if err != nil {
 		return nil, err
 	}
 
-  for _, participation := range currentCompany.Participations {
-    _, err := c.DeleteCompanyParticipation(companyID, participation.Event)
-    if err != nil {
-      return nil, err
-    }
-  }
+	for _, participation := range currentCompany.Participations {
+		_, err := c.DeleteCompanyParticipation(companyID, participation.Event)
+		if err != nil {
+			return nil, err
+		}
+	}
 
-  sessions, err := Sessions.GetSessions(GetSessionsOptions{Company: &companyID})
+	sessions, err := Sessions.GetSessions(GetSessionsOptions{Company: &companyID})
 	if err != nil {
 		return nil, err
 	}
 
-  for _, session := range sessions {
-    _, err := Sessions.DeleteSession(session.ID)
-    if err != nil {
-      return nil, err
-    }
-  }
+	for _, session := range sessions {
+		_, err := Sessions.DeleteSession(session.ID)
+		if err != nil {
+			return nil, err
+		}
+	}
 
-  err = c.Collection.FindOneAndDelete(ctx, bson.M{"_id": companyID}).Decode(&company)
-  if err != nil {
-    return nil, err
-  }
+	err = c.Collection.FindOneAndDelete(ctx, bson.M{"_id": companyID}).Decode(&company)
+	if err != nil {
+		return nil, err
+	}
 
-  // Ignore error, if contact doesn't exist, it's ok.
-  Contacts.DeleteContact(company.Contact)
+	// Ignore error, if contact doesn't exist, it's ok.
+	Contacts.DeleteContact(company.Contact)
 
 	return &company, nil
 }
@@ -1297,45 +1301,44 @@ func (c *CompaniesType) RemoveCompanyParticipationBilling(companyID primitive.Ob
 
 // DeleteCompanyParticipation deletes a company's participation related to the eventID
 func (c *CompaniesType) DeleteCompanyParticipation(companyID primitive.ObjectID, eventID int) (*models.Company, error) {
-  ctx := context.Background();
-  var updatedCompany models.Company
-
-  company, err := c.GetCompany(companyID)
-  if err != nil {
-    return nil, err
-  }
-
-  for _, p := range company.Participations {
-    if p.Event == eventID {
-      for _, communication := range p.Communications {
-        _, err := c.DeleteCompanyThread(companyID, communication)
-        if err != nil {
-          return nil, err
-        }
-      }
-    }
-  }
-
-  var updateQuery = bson.M{
-    "$pull": bson.M{
-      "participations": bson.M{
-        "event": eventID,
-      },
-    },
-  }
-
-  var filterQuery = bson.M{"_id": companyID}
-
-  var optionsQuery = options.FindOneAndUpdate()
-  optionsQuery.SetReturnDocument(options.After)
-
-  if err := c.Collection.FindOneAndUpdate(ctx, filterQuery, updateQuery, optionsQuery).Decode(&updatedCompany); err != nil {
-    return nil, err
-  }
-
-  return &updatedCompany, nil
-}
+	ctx := context.Background()
+	var updatedCompany models.Company
+
+	company, err := c.GetCompany(companyID)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, p := range company.Participations {
+		if p.Event == eventID {
+			for _, communication := range p.Communications {
+				_, err := c.DeleteCompanyThread(companyID, communication)
+				if err != nil {
+					return nil, err
+				}
+			}
+		}
+	}
 
+	var updateQuery = bson.M{
+		"$pull": bson.M{
+			"participations": bson.M{
+				"event": eventID,
+			},
+		},
+	}
+
+	var filterQuery = bson.M{"_id": companyID}
+
+	var optionsQuery = options.FindOneAndUpdate()
+	optionsQuery.SetReturnDocument(options.After)
+
+	if err := c.Collection.FindOneAndUpdate(ctx, filterQuery, updateQuery, optionsQuery).Decode(&updatedCompany); err != nil {
+		return nil, err
+	}
+
+	return &updatedCompany, nil
+}
 
 // FindThread finds a thread in a company
 func (c *CompaniesType) FindThread(threadID primitive.ObjectID) (*models.Company, error) {