fix(Schematics): Add group folder after feature name folder (#737)

Author: brandonroberts

modules/schematics/src/effect/index.ts

@@ -61,8 +61,8 @@ function addImportToNgModule(options: EffectOptions): Rule {
 
     const effectsPath =
       `/${options.sourceDir}/${options.path}/` +
-      (options.group ? 'effects/' : '') +
       (options.flat ? '' : stringUtils.dasherize(options.name) + '/') +
+      (options.group ? 'effects/' : '') +
       stringUtils.dasherize(options.name) +
       '.effects';
     const relativePath = buildRelativePath(modulePath, effectsPath);

modules/schematics/src/utility/ngrx-utils.ts

@@ -38,8 +38,8 @@ export function addReducerToState(options: ReducerOptions): Rule {
 
     const reducerPath =
       `/${options.sourceDir}/${options.path}/` +
-      (options.group ? 'reducers/' : '') +
       (options.flat ? '' : stringUtils.dasherize(options.name) + '/') +
+      (options.group ? 'reducers/' : '') +
       stringUtils.dasherize(options.name) +
       '.reducer';
 
@@ -217,8 +217,8 @@ export function addReducerImportToNgModule(options: ReducerOptions): Rule {
 
     const reducerPath =
       `/${options.sourceDir}/${options.path}/` +
-      (options.group ? 'reducers/' : '') +
       (options.flat ? '' : stringUtils.dasherize(options.name) + '/') +
+      (options.group ? 'reducers/' : '') +
       stringUtils.dasherize(options.name) +
       '.reducer';
     const relativePath = buildRelativePath(modulePath, reducerPath);