Search test #731

thesuzerain · 2023-10-17T07:23:36Z

No description provided.

… search-test

…into search-test

… search-test

migrations/20231005230721_dynamic-fields.sql

src/routes/v2/admin.rs

src/routes/v2/projects.rs

src/routes/v2_reroute.rs

OmegaJak · 2023-10-23T17:01:35Z

src/routes/v2_reroute.rs

+    }
+}
+
+pub async fn alter_actix_multipart(


Worth considering, not sure if it's worth doing - the methods in this file seem like great candidates for more detailed unit-level tests just around them, no integration. Seems like there are probably a lot of edge cases to be tested here, which can be done faster and more precisely than at the integration level

Yeah definitely. I think I want to come back to write a lot of tests around this area as I refactor it a little bit. Tbh Im not sure how I feel about the different ways to handle these rerouting functions so far, none of the ideas Ive run through have really felt 100% right

migrations/20231005230721_dynamic-fields.sql

src/database/models/categories.rs

sqlx-data.json

migrations/20231005230721_dynamic-fields.sql

src/database/models/project_item.rs

src/models/v2/mod.rs

src/routes/v2/admin.rs

src/routes/updates.rs

migrations/20231005230721_dynamic-fields.sql

… search-test

Geometrically · 2023-11-03T04:39:37Z

migrations/20231005230721_dynamic-fields.sql

+
+ALTER TABLE loaders ADD CONSTRAINT unique_loader_name UNIQUE (loader);
+
+ALTER TABLE mods ADD COLUMN game_id integer REFERENCES games NOT NULL DEFAULT 1; -- all past ones are minecraft-java


this wasn't how I imagined this system would work- mainly bc the games a project supports is determined by the project types, which are determined by the loaders. So if a project had fabric and forge loaders, it would be a mod project type, and that wld be minecraft.

IMO we should probs get this merged so if possible we might just want to get rid of the game specific logic and add it to a later PR. LMK

Geometrically · 2023-11-03T04:40:12Z

migrations/20231005230721_dynamic-fields.sql

+ALTER TABLE loaders ADD CONSTRAINT unique_loader_name UNIQUE (loader);
+
+ALTER TABLE mods ADD COLUMN game_id integer REFERENCES games NOT NULL DEFAULT 1; -- all past ones are minecraft-java
+ALTER TABLE loaders ADD COLUMN game_id integer REFERENCES games NOT NULL DEFAULT 1; -- all past ones are minecraft-java


See above. Loaders technically aren't game specific, games are loader/project type specific

Geometrically · 2023-11-03T04:43:21Z

src/database/models/project_item.rs

@@ -141,6 +142,7 @@ impl ModCategory {
 #[derive(Clone)]
 pub struct ProjectBuilder {
    pub project_id: ProjectId,
+    pub game: Game,


see above note, don't think hame is actually needed here

Geometrically · 2023-11-03T04:43:42Z

src/database/models/project_item.rs

@@ -141,6 +142,7 @@ impl ModCategory {
 #[derive(Clone)]
 pub struct ProjectBuilder {
    pub project_id: ProjectId,
+    pub game: Game,
    pub project_type_id: ProjectTypeId,


this column should also be able to be dropped, since project types will be an array inferred from loaders

Geometrically · 2023-11-03T04:45:25Z

src/models/mod.rs

@@ -14,3 +14,5 @@ pub mod sessions;
 pub mod teams;


imo there should be a module for each api version, like v2 and v3. for ones unchanged in v2 -> v3, the v2 should just reexport the v3 file

Geometrically · 2023-11-03T04:53:52Z

src/routes/v2/organizations.rs

see above comment, no need to reroute here

Geometrically · 2023-11-03T04:55:06Z

src/routes/v2/project_creation.rs

this is going to be a massive scope creep but bc we are drastically simplifying the project create route in v3 (basically making it only a shell of itself, this should stay as is and the v3 route should be simplified). ping me and I can explain more

Geometrically · 2023-11-03T04:58:23Z

src/routes/v3/project_creation.rs

+#[derive(Error, Debug)]
+pub enum CreateError {


when you convert this you should just make this use the ApiError type, you could also do this for the v2 route if u want

Geometrically · 2023-11-03T05:00:10Z

src/search/mod.rs

+           "fabric_client_side": ["required"]
+           "fabric_server_side": ["optional"]
+    */
+    pub loader_fields: HashMap<String, Vec<String>>,


since loader field names are unique I don't think you need to prefix anything here. Also don't see point of flatten

Geometrically · 2023-11-03T05:02:00Z

src/validate/mod.rs

honestly I think you can just get rid of validators for now and just check for file extensions

Geometrically · 2023-11-08T01:04:35Z

migrations/20231005230721_dynamic-fields.sql

+-- We create 'modpack' categories for every loader 
+-- That way we keep information like "this modpack is a fabric modpack"
+INSERT INTO categories (category, project_type) 
+SELECT DISTINCT l.loader, pt.id FROM loaders l CROSS JOIN project_types pt WHERE pt.name = 'modpack' AND l.loader != 'mrpack';
+
+-- insert the loader of every modpack mod as a category
+INSERT INTO mods_categories (joining_mod_id, joining_category_id)
+SELECT DISTINCT m.id, c.id 
+FROM mods m
+LEFT JOIN versions v ON m.id = v.mod_id
+LEFT JOIN loaders_versions lv ON v.id = lv.version_id
+LEFT JOIN loaders l ON lv.loader_id = l.id
+CROSS JOIN categories c 
+WHERE m.project_type = (SELECT id FROM project_types WHERE name = 'modpack') AND c.category = l.loader;
+
+-- Non mrpack loaders no longer support modpacks
+DELETE FROM loaders_project_types WHERE joining_loader_id != (SELECT id FROM loaders WHERE loader = 'mrpack') AND joining_project_type_id = (SELECT id FROM project_types WHERE name = 'modpack');


How come the loaders were made into categories? shouldn't they just be per-version dynamic fields?

Geometrically · 2023-11-08T01:10:09Z

src/routes/v2/images.rs

why isn't this an exclusive v3 route? since it was added post v2-prod

Geometrically · 2023-11-08T01:10:49Z

src/routes/v2/organizations.rs

same here- this file should be deleted and moved entirely to v3

Geometrically · 2023-11-08T01:11:47Z

src/routes/v2/teams.rs

orgs related routes in here should also be rerouted

* computer switch * some fixes; github action * added pr to master * sqlx database setup * switched intial GHA test db * removed sqlx database setup * unfinished patch route * bug fixes + tests * more tests, more fixes, cargo fmt * merge fixes * more tests, full reorganization * fmt, clippy * sqlx-data * revs * removed comments * delete revs

… search-test

* search patch for accurate loader/gv filtering * backup * basic search test * finished test * incomplete commit; backing up * Working multipat reroute backup * working rough draft v3 * most tests passing * works * search v2 conversion * added some tags.rs v2 conversions * Worked through warnings, unwraps, prints * refactors * new search test * version files changes fixes * redesign to revs * removed old caches * removed games * fmt clippy * merge conflicts * fmt, prepare * moved v2 routes over to v3 * fixes; tests passing * project type changes * moved files over * fmt, clippy, prepare, etc * loaders to loader_fields, added tests * fmt, clippy, prepare * fixed sorting bug * reversed back- wrong order for consistency * fmt; clippy; prepare --------- Co-authored-by: Jai A <[email protected]>

Geometrically and others added 17 commits October 3, 2023 18:52

search patch for accurate loader/gv filtering

521ccab

backup

96f8e78

Merge branch 'master' of http://www.github.com/modrinth/labrinth into…

340d69f

… search-test

Merge branch 'search-test' of http://www.github.com/modrinth/labrinth …

e3c207f

…into search-test

basic search test

81834ef

Merge branch 'master' of http://www.github.com/modrinth/labrinth into…

322efc4

… search-test

finished test

61488b9

incomplete commit; backing up

39a7dac

Working multipat reroute backup

21ae780

working rough draft v3

36bcd2f

most tests passing

efbea3e

works

4b6f349

search v2 conversion

0f61721

added some tags.rs v2 conversions

d8740ec

Worked through warnings, unwraps, prints

3eb68ae

refactors

34ac302

new search test

eed8224

OmegaJak reviewed Oct 23, 2023

View reviewed changes

version files changes fixes

89658d5

Geometrically suggested changes Oct 26, 2023

View reviewed changes

thesuzerain added 7 commits October 27, 2023 15:06

redesign to revs

b9b16f5

removed old caches

74e9efb

removed games

a40f052

fmt clippy

8950fa3

Merge branch 'master' of http://www.github.com/modrinth/labrinth into…

07be8b4

… search-test

merge conflicts

9086d52

fmt, prepare

d025059

triphora added the hacktoberfest-accepted label Oct 28, 2023

thesuzerain added 2 commits October 30, 2023 13:47

moved v2 routes over to v3

0072fe8

Merge branch 'master' of http://www.github.com/modrinth/labrinth into…

65db21f

… search-test

fixes; tests passing

82bd306

Geometrically suggested changes Nov 3, 2023

View reviewed changes

Geometrically mentioned this pull request Nov 3, 2023

Loader + game version combo search field #622

Closed

thesuzerain added 3 commits November 6, 2023 17:02

project type changes

2ca7ce9

moved files over

6382627

fmt, clippy, prepare, etc

65c380f

thesuzerain marked this pull request as ready for review November 7, 2023 01:51

Geometrically suggested changes Nov 8, 2023

View reviewed changes

thesuzerain added 5 commits November 8, 2023 15:12

loaders to loader_fields, added tests

ea95f7e

fmt, clippy, prepare

68a9200

fixed sorting bug

9cde43a

reversed back- wrong order for consistency

2b3264b

Geometrically approved these changes Nov 11, 2023

View reviewed changes

thesuzerain added 2 commits November 11, 2023 15:28

Merge branch 'master' of http://www.github.com/modrinth/labrinth into…

400b896

… search-test

fmt; clippy; prepare

6c513cc

thesuzerain merged commit ae1c534 into master Nov 12, 2023
6 checks passed

thesuzerain deleted the search-test branch November 13, 2023 18:25

This was referenced Jan 28, 2024

Filtering loaders and game versions together does not specifically look for them on the same version modrinth/code#1907

Closed

Support for loader + game version combos modrinth/knossos#1160

Closed

triphora mentioned this pull request Nov 12, 2023

Improve Testing modrinth/code#2823

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Search test #731

Search test #731

thesuzerain commented Oct 17, 2023

OmegaJak Oct 23, 2023

thesuzerain Oct 25, 2023

Geometrically Nov 3, 2023

Geometrically Nov 3, 2023

Geometrically Nov 3, 2023

Geometrically Nov 3, 2023

Geometrically Nov 3, 2023

Geometrically Nov 3, 2023

Geometrically Nov 3, 2023

Geometrically Nov 3, 2023

Geometrically Nov 3, 2023

Geometrically Nov 3, 2023

Geometrically Nov 8, 2023

Geometrically Nov 8, 2023

Geometrically Nov 8, 2023

Geometrically Nov 8, 2023


		ALTER TABLE loaders ADD CONSTRAINT unique_loader_name UNIQUE (loader);

		ALTER TABLE mods ADD COLUMN game_id integer REFERENCES games NOT NULL DEFAULT 1; -- all past ones are minecraft-java

Search test #731

Search test #731

Conversation

thesuzerain commented Oct 17, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment