Onboarding Exercise

hknweb/events/forms/event/create.py

@@ -30,6 +30,7 @@ class Meta:
  model = Event
  fields = (
  "name",
+ "point_of_contact",
  "location",
  "description",
  "event_type",

hknweb/events/migrations/0013_alter_icalview_options.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.2.11 on 2024-03-16 05:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("events", "0012_icalview"),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name="icalview",
+ options={"verbose_name": "iCal view"},
+ ),
+ ]

hknweb/events/migrations/0014_event_point_of_contact.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.11 on 2024-03-16 05:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("events", "0013_alter_icalview_options"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="event",
+ name="point_of_contact",
+ field=models.CharField(default="N/A", max_length=255),
+ ),
+ ]

hknweb/events/models/event.py

@@ -13,6 +13,7 @@
 
 class Event(models.Model):
  name = models.CharField(max_length=255)
+ point_of_contact = models.CharField(max_length=255, default="N/A")
  start_time = models.DateTimeField()
  end_time = models.DateTimeField()
  location = models.CharField(max_length=255)

hknweb/events/views/event_transactions/show_event.py

@@ -30,6 +30,7 @@ def show_details_helper(request, id, back_link: str, can_edit: bool):
 
  context = {
  "event": event,
+ "event_point_of_contact": markdownify(event.point_of_contact),
  "event_description": markdownify(event.description),
  "event_location": format_url(event.location),
  "user_access_level": ACCESSLEVEL_TO_DESCRIPTION[get_access_level(request.user)],

hknweb/forms.py

@@ -206,13 +206,15 @@ def email_to_username(email: str) -> str:
 
  # Get existing usernames
  usernames = []
+ emails = []
  invalid_emails = []
  for row in rows:
  email = row["Berkeley email"]
  username = email_to_username(email)
 
  if username:
  usernames.append(username)
+ emails.append(email)
  else:
  invalid_emails.append(email)
 
@@ -224,6 +226,12 @@ def email_to_username(email: str) -> str:
  )
  )
 
+ existing_emails = set(
+ User.objects.filter(email__in=emails).values_list(
+ "email", flat=True
+ )
+ )
+
  # Setup account provisioning utils
  # Get candidate group to add users to
  group = Group.objects.get(name=settings.CAND_GROUP)
@@ -237,9 +245,14 @@ def generate_password() -> str:
  return password
 
  email_information = []
+ skipped_rows = []
  for row in rows:
  # If username is None or already exists, skip provisioning
  if (row["username"] is None) or (row["username"] in existing_usernames):
+ skipped_rows.append(row)
+ continue
+ if ((row["Berkeley email"] is None) or (row["Berkeley email"] in existing_emails)):
+ skipped_rows.append(row)
  continue
 
  # Generate a password
@@ -250,7 +263,7 @@ def generate_password() -> str:
  username=row["username"],
  first_name=row["First name"],
  last_name=row["Last name"],
- email=row["Berkeley email"],
+ email=row["Berkeley email"].lower(),
  password=password,
  )
  user.save()
@@ -260,8 +273,13 @@ def generate_password() -> str:
 
  # Add information for sending emails
  email_information.append((user, password))
+ existing_usernames.add(row["username"])
+ existing_emails.add(row["Berkeley email"].lower())
 
  self.email_information = email_information
 
  # Save information for adding messages
  self.invalid_emails = invalid_emails
+
+ for row in skipped_rows:
+ print(row)

hknweb/templates/events/show_details.html

@@ -114,6 +114,7 @@ <h1 id="event-detail-title"> {{ event.name }} </h1>
  <div id="left-details">
 
  <p>{{ event_description | safe }}</p>
+ <p><b>Point of Contact</b>: {{ event.point_of_contact}}</p>
  <p><b>Event Type</b>: {{ event.event_type }}</p>
  <p><b>Location</b>: {{ event_location }}</p>
  <p><b>Date(s) and Time(s)</b>: {{ event | process_event_time }}</p>

requirements.txt

@@ -0,0 +1,11 @@
+bleach==6.1.0
+dal==0.2
+djangorestframework==3.14.0
+Fabric==3.2.2
+google_api_python_client==2.122.0
+icalendar==5.0.11
+invoke==2.2.0
+Markdown==3.6
+protobuf==5.26.0
+pytz==2024.1
+Requests==2.31.0