Remove DM code

Closes #25
2019-11-03 20:54:30 +08:00 · 2019-11-03 20:54:30 +08:00 · e0d3293eb7
parent fffda5271b
commit e0d3293eb7
6 changed files with 17 additions and 87 deletions
--- a/2
+++ b/2
@ -45,7 +45,7 @@ test_unit:
 test_integration: test_integration_prepare
 	$(GOTEST) -tags=integration -v -cover
 test_integration_prepare:
-	$(GORUN) scripts/testutils.go isrunning || $(DOCKERCOMPOSE) -f $(DOCKERCOMPOSE_INTEGRATION_CONFIG) up -d
+	$(GORUN) scripts/testutils.go isrunning || ($(DOCKERCOMPOSE) -f $(DOCKERCOMPOSE_INTEGRATION_CONFIG) up -d && echo "$(shell tput bold)NOTE: Started some containers, cleanup with 'make test_integration_cleanup'$(shell tput sgr0)")
 	$(GORUN) scripts/testutils.go wait
 test_integration_sql_shell:
 	$(DOCKERCOMPOSE) -f $(DOCKERCOMPOSE_INTEGRATION_CONFIG) exec pg psql -d core
--- a/conversation.go
+++ b/conversation.go
@ -37,8 +37,8 @@ func (h *Handler) CreateConversation(w http.ResponseWriter, r *http.Request, p h

 	// Conversation
 	_, err1 := tx.Exec(`
-		INSERT INTO "conversation" (id, title, dm, picture) VALUES ($1, $2, $3, $4)
-	`, conversation.ID, conversation.Title, conversation.DM, conversation.Picture)
+		INSERT INTO "conversation" (id, title, picture) VALUES ($1, $2, $3)
+	`, conversation.ID, conversation.Title, conversation.Picture)
 	// First member
 	_, err2 := tx.Exec(`
 		INSERT INTO member ("user", "conversation") VALUES ($1, $2)
@ -86,14 +86,9 @@ func (h *Handler) GetConversations(w http.ResponseWriter, r *http.Request, p htt

 	// Select
 	rows, err := h.db.Query(`
-		SELECT "conversation".id, CASE
-      WHEN "conversation".dm THEN (SELECT CONCAT("user".first_name, ' ', "user".last_name) FROM "user", member WHERE "user".id <> $1 AND "user".id = member.user AND member.conversation = "conversation".id)
-      ELSE title
-    END AS title,
-    "conversation".picture,
-    member.pinned
-    FROM "conversation", member
-    WHERE member.conversation = "conversation".id AND member.user = $1
+		SELECT "conversation".id, "conversation".title, "conversation".picture, member.pinned
+		FROM "conversation", member
+		WHERE member.conversation = "conversation".id AND member.user = $1
 	`, userID)
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@ -128,14 +123,9 @@ func (h *Handler) GetConversation(w http.ResponseWriter, r *http.Request, p http

 	// Select
 	err := h.db.QueryRow(`
-		SELECT "conversation".id, CASE
-    WHEN "conversation".dm THEN (SELECT CONCAT("user".first_name, ' ', "user".last_name) FROM "user", member WHERE "user".id <> $1 AND "user".id = member.user AND member.conversation = "conversation".id)
-      ELSE title
-    END AS title,
-    "conversation" picture,
-    member.pinned
-    FROM "conversation", member
-    WHERE member.conversation = "conversation".id AND member.user = $1 AND member.conversation = $2
+		SELECT "conversation".id, "conversation".title, "conversation".picture, member.pinned
+		FROM "conversation", member
+		WHERE member.conversation = "conversation".id AND member.user = $1 AND member.conversation = $2
 	`, userID, conversationID).Scan(&conversation.ID, &conversation.Title, &conversation.Picture, &conversation.Pinned)

 	switch {
@ -289,7 +279,9 @@ func (h *Handler) DeleteConversation(w http.ResponseWriter, r *http.Request, p h

 func (h *Handler) CreateConversationMember(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
 	// Parse
-	userID := r.Context().Value("user").(string)
+	// We don't need the user ID here because when we first create a conversation, it should have no members
+	// TODO: conversations should have conversation owners?
+	//userID := r.Context().Value("user").(string)
 	conversationID := p.ByName("conversation")
 	member := User{}
 	decoder := json.NewDecoder(r.Body)
@ -308,65 +300,7 @@ func (h *Handler) CreateConversationMember(w http.ResponseWriter, r *http.Reques
 	// Log
 	log.Print(member)

-	// Check for existing DM
-	var dmID string
-	err = h.db.QueryRow(`
-    SELECT "conversation".id FROM "conversation", "member"
-    WHERE
-      "conversation".dm = TRUE
-      AND "conversation".id = "member".conversation
-      AND "member".user = $1
-  `, member.ID).Scan(&dmID)
-	if err != sql.ErrNoRows {
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
-	} else if err == nil {
-		w.Write([]byte(dmID))
-		return
-	}
-
-	// Check for valid conversation and prevent duplicate entries
-	var test string
-	err = h.db.QueryRow(`
-    SELECT "conversation".id FROM "conversation", "member"
-    WHERE
-      "conversation".id = $1
-      AND (
-        "conversation".dm = FALSE
-        OR (SELECT
-          COUNT("member".user)
-          FROM "member"
-          WHERE "member".conversation = $1)
-        <= 2)
-      AND "member".conversation = "conversation".id
-      AND "member".user <> $2
-  `, conversationID, member.ID).Scan(&test)
-	switch {
-	case err == sql.ErrNoRows:
-		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
-		return
-	case err != nil:
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		log.Print(err)
-		return
-	}
-
-	// Check user adding the user is in conversation
-	var conversationID2 string
-	err = h.db.QueryRow(`
-		SELECT id FROM "conversation"
-		INNER JOIN member
-		ON member.conversation = "conversation".id AND member.user = $1 AND member.conversation = $2
-	`, userID, conversationID).Scan(&conversationID2)
-	switch {
-	case err == sql.ErrNoRows:
-		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
-		return
-	case err != nil:
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		log.Print(err)
-		return
-	}
+	// TODO: When we need stronger constraints, add some policy around existing conversations with a title set

 	// Insert
 	_, err = h.db.Exec(`
--- a/conversation_test.go
+++ b/conversation_test.go
@ -72,7 +72,6 @@ func testCreateConversation(db *sql.DB, router http.Handler, users []User) func(
 		// Test
 		mockConversation := &Conversation{
 			Title: null.StringFrom("Test Conversation 1"),
-			DM:    false,
 		}
 		b, _ := json.Marshal(mockConversation)

@ -87,11 +86,11 @@ func testCreateConversation(db *sql.DB, router http.Handler, users []User) func(
 		// Assert
 		got, want := &Conversation{}, mockConversation
 		json.NewDecoder(w.Body).Decode(&got)
-		if got.DM != want.DM || got.Title.String != want.Title.String {
-			t.Error("Wanted a Conversation with same Title, DM. Got something else")
+		if got.Title.String != want.Title.String {
+			t.Error("Wanted a Conversation with same Title. Got something else")
 		}

-		assertDB(t, db, `SELECT * FROM "conversation" WHERE title = $1 AND dm = $2`, mockConversation.Title, mockConversation.DM)
+		assertDB(t, db, `SELECT * FROM "conversation" WHERE title = $1`, mockConversation.Title)
 		assertDB(t, db, `SELECT * FROM member WHERE "user" = $1 AND "conversation" = $2`, users[0].ID, got.ID)

 	}
@ -103,7 +102,6 @@ func testGetConversations(db *sql.DB, router http.Handler, users []User) func(t
 		// Setup
 		mockConversation := &Conversation{
 			Title: null.StringFrom("Test Conversation 2"),
-			DM:    false,
 		}
 		bs, _ := json.Marshal(mockConversation)

--- a/postgres/1_initial.up.sql
+++ b/postgres/1_initial.up.sql
@ -11,7 +11,6 @@ CREATE TABLE IF NOT EXISTS "user" (

 CREATE TABLE IF NOT EXISTS "conversation" (
 	id BYTEA PRIMARY KEY,
-	dm BOOLEAN,
 	title VARCHAR(65535),
 	picture VARCHAR(63535)
 );
--- a/scripts/testutils.go
+++ b/scripts/testutils.go
@ -47,7 +47,7 @@ func isrunning() int {
 }

 func wait() int {
-	for i := 0; i < 60; i += 1 {
+	for i := 0; i < 120; i += 1 {
 		timer := time.NewTimer(1 * time.Second)
 		if isrunning() == 0 {
 			return 0
--- a/types.go
+++ b/types.go
@ -21,7 +21,6 @@ type Member struct {
 type Conversation struct {
 	ID      string      `json:"id"`      // id
 	Title   null.String `json:"title"`   // title
-	DM      bool        `json:"dm"`      // dm
 	Picture null.String `json:"picture"` // picture
 	Pinned  bool        `json:"pinned"`  // pinned
 }